More Serialization Client/Server "Fixes"