Minor fixes in xml deserializer.