Java 1.6 fixes