various changes for setuptools