Fix up cmdlist