Switch to java 6 x2