Fixed more bugs in JDK setup