HALO bug fixes

Change-Id: I7dfee00d3ce531d0b7d901c82a28f8a44f842c4c