Fixes for flake8.