Upgrade to Java 1.7