more tweaks for setuptools