Fixing some Java 7 notes