Updates for building on JDK 8