Move to JDK 1.6