Fix up order plan