More serialization improvements.