Fix up cli script