some minor changes to make setup.py work