Fix savestates

23 jobs for master in 1 minute and 51 seconds (queued for 7 seconds)