minor updates for Java 1.8