Fixed some issues

8 jobs for 565-external-storages in 3 minutes and 23 seconds (queued for 1 second)