Fix minor issues signaled by flake8