webservice fixes from rsmart