More serialization / reflection fixes.