XML Seriazlization fixes