Shuffle around some package installations to fit newer paradigm.