fix build issues (HALO Update)