Fix some warnings and errors resulting from different versions of
Eclipse/Junit.