Minor fixes
Merge branch 'release/2.4.2'