More adjustments for using official packages over repo.