Fixes and changes for RC6