Fixes required by new pip.