Small fixes
Merge branch 'release-1.2.1'