Fixes for 1.22 release.
Merge pull request #44 from rolledback/master

Fixes for 1.22 release.