Minor bugs found on post production post upgrade

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