Save/Load bug fixes.