Fixed Java JDK issues