Java 1.6 support
Fork clean up