Fixed JDK 8 compile errors