Fix problems caused by serialization changes.