Fixed some bugs with setuptools