Changes due to openjdk6 compatibility.