Make translation persistence a little more robust