Fix some flake8 warnings