Clean up some issues when pulling from pip