Minor adjusts to setup.py