HRCPP-134 Minor compiler fixes