Fixes to pass flake8