Fixes in HALO

Change-Id: Ic4bac03187277da805f7569c33590ef118fe2f7f