HV-745 Make compilation work against Java 6