Updates for jdk8