Add Java 1.7 compat
Cleanups