diff --git a/CHANGELOG.md b/CHANGELOG.md
index 337ba6ef24..abefd6b0b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@
 
 Changes:
 
+- Overrides for `westmint` spec (same as `statemint`)
+- Adjust `tx.session.setKeys` TS augmentation to allow `string` & `Uint8Array` keys
+- Added 9031 upgrade block for Westend
 - Update static metadata to latest Substrate
+- Sanitizing `BN` imports to `type`-only as required
 
 
 ## 4.12.1 May 30, 2021
diff --git a/package.json b/package.json
index a3c299c85a..977e7fcc46 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "lint": "polkadot-dev-run-lint",
     "clean": "polkadot-dev-clean-build",
     "postinstall": "polkadot-dev-yarn-only",
-    "test": "polkadot-dev-run-test --coverage --detectOpenHandles --runInBand --testPathIgnorePatterns e2e",
-    "test:one": "polkadot-dev-run-test --detectOpenHandles",
+    "test": "polkadot-dev-run-test --coverage --detectOpenHandles --forceExit --runInBand --testPathIgnorePatterns e2e",
+    "test:one": "polkadot-dev-run-test --detectOpenHandles --forceExit",
     "test:watch": "polkadot-dev-run-test --watch"
   },
   "devDependencies": {
diff --git a/packages/api/src/augment/tx.ts b/packages/api/src/augment/tx.ts
index 397984418c..11a8ff557c 100644
--- a/packages/api/src/augment/tx.ts
+++ b/packages/api/src/augment/tx.ts
@@ -2545,7 +2545,7 @@ declare module '@polkadot/api/types/submittable' {
        * - DbWrites per key id: `KeyOwner`
        * # </weight>
        **/
-      setKeys: AugmentedSubmittable<(keys: Keys, proof: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Keys, Bytes]>;
+      setKeys: AugmentedSubmittable<(keys: Keys | string | Uint8Array, proof: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Keys, Bytes]>;
       /**
        * Generic tx
        **/
diff --git a/packages/typegen/src/util/derived.ts b/packages/typegen/src/util/derived.ts
index e83188e78e..25395cc8b1 100644
--- a/packages/typegen/src/util/derived.ts
+++ b/packages/typegen/src/util/derived.ts
@@ -74,6 +74,9 @@ export function getSimilarTypes (registry: Registry, definitions: Record<string,
     setImports(definitions, imports, ['IExtrinsic']);
 
     return ['IExtrinsic'];
+  } else if (type === 'Keys') {
+    // This one is weird... surely it should popup as a Tuple? (but either way better as defined hex)
+    return ['Keys', 'string', 'Uint8Array'];
   } else if (type === 'StorageKey') {
     // TODO We can do better
     return ['StorageKey', 'string', 'Uint8Array', 'any'];
diff --git a/packages/types-known/src/upgrades/westend.ts b/packages/types-known/src/upgrades/westend.ts
index acaac4fa71..4a949323f3 100644
--- a/packages/types-known/src/upgrades/westend.ts
+++ b/packages/types-known/src/upgrades/westend.ts
@@ -9,7 +9,8 @@ const upgrades: ChainUpgradesRaw = [
   [1030162, 31], [1119657, 32], [1199282, 33], [1342534, 34], [1392263, 35],
   [1431703, 36], [1433369, 37], [1490972, 41], [2087397, 43], [2316688, 44],
   [2549864, 45], [3925782, 46], [3925843, 47], [4207800, 48], [4627944, 49],
-  [5124076, 50], [5478664, 900], [5482450, 9000], [5584305, 9010], [5784566, 9030]
+  [5124076, 50], [5478664, 900], [5482450, 9000], [5584305, 9010], [5784566, 9030],
+  [5879822, 9031]
 ];
 
 export default upgrades;