Update to Java 1.7