Minor serialization tweaks