Fixup element save