Java 8 support

Minor cleanups and support for Java 8 (we'll need it to use ABSmodJ later)