Some fixes to setup.py for version