Minor: code review and correction Web service responses, etc