Tweaks to java auto install