Java 6 upgrade.