Fixes for Halo

Now Halo should work perfectly. Thanks to Gerar for helping me resolve the errors.