Fix some flake8 errors