Fix another Java 6 incompatabilities