More Java 8 adjustments