Fixed more bugs in JDK setup again