More tweaks to the save state stuff