Added a few fixes for unreliable saves.