Fix flake8 import errors