HRCPP-134 Minor compiler fixes

https://issues.jboss.org/browse/HRCPP-134