Merge branch 'minor-fixes' into 'master'