Minor changes and fixes

See merge request !492
48 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds