Som fixes in setup.py and requirements.txt files