Fixes for jdk installed