WCM-83

WCM-83 Fix issues