Modified recent updates to comply with Java 1.5.