Some fixes
setup.cfg