More RC bugfixes?