Changes for OpenJDK 11