Fixed a number of performance issues caused by the saving system.