[Bug Fix] Some fixes for the downgrade to Java 6.