Some small fixes for setup.py