webservices fixes for AFT