fixes for command-line