Tighten dependencies to avoid compile warnings