Fix up CLI