Changes to cli_stdin.cpp