Make source Java 1.6 compliant