Improve JDK installation