Small fixes found when trying a clean build in a new Eclipse
installation.