Almost fix some errors while saving with the new formats, but this needs more investigation (as do the save types).