Small fixes

1 job for master in 2 minutes and 5 seconds (queued for 3 seconds)