Test and fix command-line breakage