Dependency fixes for setup.py