Fix savestates, one more shutdown glitch

This isn't really the prettiest way, and I think we end up savestating the same systems multiple times actually, but it's a big pain to do it more cleanly...

-[Unknown]