serialization tweaks