Fix dependency order.