Tighten-up package and version resolution