jdk8 related fixes
jdk8 related fixes