Java 6 fixes