Compile with java1.6 changes