changes for latest hacking/flake8