Minor tweaks to build with Java 8.