Some improvements to state tracking with multiple saves