flake8 fixes
py3 fixes