Fixes in Halo

Change-Id: I38c8fe4f812bb3a6183ccce193590ab0272542d7