More Java 8 adjustments
Small adjustments between core and core-jdk8