EMI: Save/restore fixes

This fixes animation issues when restoring a savegame.