Fix XML issues in WebServices