Order dispatch-related fixes