diff --git a/maas-schemas-ts/src/core/itinerary.ts b/maas-schemas-ts/src/core/itinerary.ts
index d39b7a34c..2c6ff0547 100644
--- a/maas-schemas-ts/src/core/itinerary.ts
+++ b/maas-schemas-ts/src/core/itinerary.ts
@@ -91,7 +91,6 @@ export type Itinerary = t.Branded<
     superMode?: TravelMode_.SuperMode;
     tags?: Array<string>;
     label?: string;
-    n?: number;
     isWhimRide?: boolean;
     provider?: string;
   } & {
@@ -124,7 +123,6 @@ export const Itinerary = t.brand(
       superMode: TravelMode_.SuperMode,
       tags: t.array(t.string),
       label: t.string,
-      n: t.number,
       isWhimRide: t.boolean,
       provider: t.string,
     }),
@@ -158,7 +156,6 @@ export const Itinerary = t.brand(
       superMode?: TravelMode_.SuperMode;
       tags?: Array<string>;
       label?: string;
-      n?: number;
       isWhimRide?: boolean;
       provider?: string;
     } & {
diff --git a/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts b/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts
index d3371ce55..018ba8cb0 100644
--- a/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts
+++ b/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts
@@ -12,6 +12,7 @@ import * as UnitsGeo_ from 'maas-schemas-ts/core/components/units-geo';
 import * as Address_ from 'maas-schemas-ts/core/components/address';
 import * as Station_ from 'maas-schemas-ts/core/components/station';
 import * as Units_ from 'maas-schemas-ts/core/components/units';
+import * as TravelMode_ from 'maas-schemas-ts/core/components/travel-mode';
 import * as Common_ from 'maas-schemas-ts/core/components/common';
 import * as ApiCommon_ from 'maas-schemas-ts/core/components/api-common';
 
@@ -50,7 +51,7 @@ export type Payload = t.Branded<
     arriveBy?: Units_.Time;
     leaveAtReturn?: Units_.Time;
     arriveByReturn?: Units_.Time;
-    modes?: string;
+    modes?: TravelMode_.SuperMode;
     transitMode?: string & ('TRAIN' | 'BUS' | 'SUBWAY' | 'TRAM' | 'RAIL');
     options?: {};
     bookingIdToExtend?: Units_.Uuid;
@@ -69,7 +70,7 @@ export type Payload = t.Branded<
     | Units_.Time
     | Units_.Time
     | Units_.Time
-    | string
+    | TravelMode_.SuperMode
     | (string & ('TRAIN' | 'BUS' | 'SUBWAY' | 'TRAM' | 'RAIL'))
     | {}
     | Units_.Uuid
@@ -93,7 +94,7 @@ export const Payload = t.brand(
       arriveBy: Units_.Time,
       leaveAtReturn: Units_.Time,
       arriveByReturn: Units_.Time,
-      modes: t.string,
+      modes: TravelMode_.SuperMode,
       transitMode: t.intersection([
         t.string,
         t.union([
@@ -123,7 +124,7 @@ export const Payload = t.brand(
         Units_.Time,
         Units_.Time,
         Units_.Time,
-        t.string,
+        TravelMode_.SuperMode,
         t.intersection([
           t.string,
           t.union([
@@ -157,7 +158,7 @@ export const Payload = t.brand(
       arriveBy?: Units_.Time;
       leaveAtReturn?: Units_.Time;
       arriveByReturn?: Units_.Time;
-      modes?: string;
+      modes?: TravelMode_.SuperMode;
       transitMode?: string & ('TRAIN' | 'BUS' | 'SUBWAY' | 'TRAM' | 'RAIL');
       options?: {};
       bookingIdToExtend?: Units_.Uuid;
@@ -176,7 +177,7 @@ export const Payload = t.brand(
       | Units_.Time
       | Units_.Time
       | Units_.Time
-      | string
+      | TravelMode_.SuperMode
       | (string & ('TRAIN' | 'BUS' | 'SUBWAY' | 'TRAM' | 'RAIL'))
       | {}
       | Units_.Uuid
diff --git a/maas-schemas-ts/translation.log b/maas-schemas-ts/translation.log
index 4335681b5..bf595a973 100644
--- a/maas-schemas-ts/translation.log
+++ b/maas-schemas-ts/translation.log
@@ -614,10 +614,6 @@ INFO: primitive type "string" used outside top-level definitions
   in ./core/itinerary.json
 WARNING: minLength field not supported outside top-level definitions
   in ./core/itinerary.json
-INFO: primitive type "number" used outside top-level definitions
-  in ./core/itinerary.json
-WARNING: minimum field not supported outside top-level definitions
-  in ./core/itinerary.json
 INFO: primitive type "string" used outside top-level definitions
   in ./core/itinerary.json
 INFO: missing description
@@ -1406,14 +1402,10 @@ WARNING: maxItems field not supported outside top-level definitions
   in ./maas-backend/push-notification/request.json
 INFO: primitive type "string" used outside top-level definitions
   in ./maas-backend/routes/routes-query/request.json
-INFO: primitive type "string" used outside top-level definitions
-  in ./maas-backend/routes/routes-query/request.json
 WARNING: patternProperty support has limitations
   in ./maas-backend/routes/routes-query/request.json
 INFO: primitive type "string" used outside top-level definitions
   in ./maas-backend/routes/routes-query/request.json
-INFO: primitive type "string" used outside top-level definitions
-  in ./maas-backend/routes/routes-query/request.json
 INFO: missing description
   in ./maas-backend/routes/routes-query/request.json
 INFO: primitive type "integer" used outside top-level definitions
diff --git a/maas-schemas/schemas/core/itinerary.json b/maas-schemas/schemas/core/itinerary.json
index feb286024..73e399e5f 100644
--- a/maas-schemas/schemas/core/itinerary.json
+++ b/maas-schemas/schemas/core/itinerary.json
@@ -94,10 +94,6 @@
       "type": "string",
       "minLength": 1
     },
-    "n": {
-      "type": "number",
-      "minimum": 0
-    },
     "isWhimRide": {
       "type": "boolean"
     },
diff --git a/maas-schemas/schemas/core/leg.json b/maas-schemas/schemas/core/leg.json
index 1b18bb56b..25d2c18ea 100644
--- a/maas-schemas/schemas/core/leg.json
+++ b/maas-schemas/schemas/core/leg.json
@@ -68,7 +68,8 @@
       "type": "string"
     },
     "co2": {
-      "type": "number"
+      "type": "number",
+      "minimum": 0
     },
     "legGeometry": {
       "type": "object",
diff --git a/maas-schemas/schemas/maas-backend/routes/routes-query/request.json b/maas-schemas/schemas/maas-backend/routes/routes-query/request.json
index 7a5a6c1f3..752747320 100644
--- a/maas-schemas/schemas/maas-backend/routes/routes-query/request.json
+++ b/maas-schemas/schemas/maas-backend/routes/routes-query/request.json
@@ -57,7 +57,7 @@
           "$ref": "http://maasglobal.com/core/components/units.json#/definitions/time"
         },
         "modes": {
-          "type": "string"
+          "$ref": "http://maasglobal.com/core/components/travel-mode.json#/definitions/superMode"
         },
         "transitMode": {
           "type": "string",