More updates for Java8 support