Fix issues in roundtripping and in deleting