Merge "hal: Fix compilation errors"