Halo fixes for building

Change-Id: Ica5669fde5e7fc316ba2e368152b617a63aac314