Update to Java 7
Small fixes here and there