Upgrade to JDK6