Fix dependencies clashes