Fixed JDK 1.6 compile errors