- Fix JDK 7 compile errors