Fixes for building RC2