Fixes for Halo 2.0