Tweaks following jdk upgrade