Repair non-linked commands