pkg pre-reqs, fixed early-commit brokenness