misc fixes
jdk