More flake8 fixes.