Java 8 Build Fixes