Fix Travis build
Fix flake8 errors