Bug Fixes after integration with a service(TC)