Java 1.6 compatibility changes