Merge pull request #2 from egonw/1-minorCleanup

Two minor cleanup patches to remove red crosses in my Eclipse.