A handful of flake8 fixes