Random urgent fixes for the executor

With every Gitlab outage, we lose our runners...

This series partially addresses that along with other issues, but isn't tested yet. We need to merge this series this week, so I would appreciate if @craftyguy and @ana could have a quick look on the series, so that I can take it into consideration when writing the last patch :)