Merge branch 'minor-fixes' into 'master'

minor fixes

See merge request !150
10 jobs for master
in 1 minute and 39 seconds and was queued for 2 seconds