Switch to Java 1.7