Some fixes for flake8