Fixes in HALO

Change-Id: Ib1d99c6ed056fcfd58e35bdc64535241edd90976