Fixes for RC3