Hottest of fixes to serialization