Fix up CLI
Disable ship in REPL.