Fixes from flake8