Some cleanup for Java 1.7