Merge pull request #2447 from rlerdorf/develop

A few minor fixes and cleanups