Halo: Add a few more fixes