Changes to support Java 1.6