Fixes some pip install issues, not all... but going in the right direction...