RC updates and other fixes