fixes and RC