Oracle JDK version update + minor fixes