Fixed more issues with saved state.

Attack does not work yet, but the problem has been identified.