Fixes for flake8