General fixes in HALO

Change-Id: Ie5129219cd27e7acf27055d177598a29111c818b