Merge branch 'alfroch-small-fixes' into 'master'

Fixing some small issues

See merge request !549
50 jobs for !549 with alfroch-small-fixes into master in 15 minutes and 28 seconds (queued for 3 seconds)