Changes that support compiling with Java 8