Compile fix for HAL and Unit Tests