WCM-77 Fix dependencies