HRM fixes