Fixes for latest flake8