Changes to assure Java 1.6 compliance.