Fix bug in cmdline; flake8 fix