minor serialization tweaks