Serialization support, tidy-up