Couple of tweaks and tidies
Merge branch 'hotfix/20.0.1'