* more setup.py fixes