Minor fixes to finish `populate_stream` command.