small cleanups
Merge branch 'release/0.1.20'