Minor improvements (and fixes)

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