Fix saving glitches