Update to JVM 7