Some small classpath tweaks to be compatible with openJDK's api