Fix nits in command line handling

Closes: bgo #722647
Closes: bgo #722463