WCF Service Fixes