Merge "hal : fix miscellaneous errors"