Initial changes for Java 1.5 compability.