fixes to support wcf