More JDK 8 adjustments