Some fixes

10 jobs for fixAthena in 1 minute and 7 seconds (queued for 1 second)