Resolved a few issues during WCF update