Tighten build and package dependencies