more halo fixups
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I912fb18a31f362e9273f1f78991148d7ef27d295