some more XML serialization fixes