Tighten dependencies up