Changes for the Java 9 platform