Fixes flakes after flake8 update