Fixes in HALO implemantation

Change-Id: I4da32a7fdba57fde36445a056324a160191bd855