Merge pull request #269 from durin42/small-fixes

Small fixes I noticed while perusing the code.