Halo Fixes

Change-Id: I6b9f6a0fb068836ec6fabbad798c5bda2258f887