Merge branch 'nits' into 'master'

Small tweaks

See merge request !106
8 jobs for master
in 1 minute and 4 seconds and was queued for 10 seconds