Fixes in HALO implenentation

Change-Id: Ic1845f1b7f12221627b7c2e097bd278eeb4df2c5