Even even more using cleanup
Merge pull request #324 from peternewman/trivial-fixes

Even even more using cleanup