Java 1.7 updates