Minor adjustments to make sure we are sudo'ing when needed.