More fixes in HALO implementation

Change-Id: I5c0d2d14253540f9f3df6030f061b04d073df8d9