Java 1.6 compliance and import fixes