XML Serializer fixes