diff --git a/.github/workflows/pr-build-check.yaml b/.github/workflows/pr-build-check.yaml
new file mode 100644
index 000000000..2236d061a
--- /dev/null
+++ b/.github/workflows/pr-build-check.yaml
@@ -0,0 +1,29 @@
+name: PR build check
+
+on:
+    pull_request:
+        types: [opened, reopened, synchronize]
+
+jobs:
+    build-check:
+        strategy:
+          fail-fast: false
+          matrix:
+            project: [api, client]
+        runs-on: ubuntu-latest
+        defaults:
+          run:
+            working-directory: ${{ matrix.project }}
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v2
+              with:
+                node-version: "16"
+
+            - name: Install Dependencies
+              run: npm install
+
+            - name: Build Check
+              run: npm run build
diff --git a/.husky/pre-push b/.husky/pre-push
deleted file mode 100755
index b4c0b12de..000000000
--- a/.husky/pre-push
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run pre-push
diff --git a/client/src/app/components/stardust/address/section/native-tokens/AssetsTable.tsx b/client/src/app/components/stardust/address/section/native-tokens/AssetsTable.tsx
index ad6f4b299..ebfe3abbc 100644
--- a/client/src/app/components/stardust/address/section/native-tokens/AssetsTable.tsx
+++ b/client/src/app/components/stardust/address/section/native-tokens/AssetsTable.tsx
@@ -35,10 +35,12 @@ const AssetsTable: React.FC<AssetsTableProps> = ({ networkId, outputs, setTokenC
                 ) {
                     for (const token of (output as CommonOutput).nativeTokens ?? []) {
                         const existingToken = theTokens.find((t) => t.id === token.id);
+                        // Convert to BigInt again in case the amount is hex
+                        const amount = BigInt(token.amount);
                         if (existingToken) {
-                            existingToken.amount += token.amount;
+                            existingToken.amount += amount;
                         } else {
-                            theTokens.push({ id: token.id, amount: token.amount });
+                            theTokens.push({ id: token.id, amount });
                         }
                     }
                 }
diff --git a/client/src/app/components/stardust/foundry/TokenInfoSection.tsx b/client/src/app/components/stardust/foundry/TokenInfoSection.tsx
index e0d189268..629f0974b 100644
--- a/client/src/app/components/stardust/foundry/TokenInfoSection.tsx
+++ b/client/src/app/components/stardust/foundry/TokenInfoSection.tsx
@@ -29,9 +29,9 @@ const TokenInfoSection: React.FC<TokenInfoSectionProps> = ({ tokenId, tokenSchem
 
     const simpleTokenScheme = tokenScheme as SimpleTokenScheme;
 
-    const maximumSupply = formatNumberWithCommas(simpleTokenScheme.maximumSupply);
-    const mintedTokens = formatNumberWithCommas(simpleTokenScheme.mintedTokens);
-    const meltedTokens = formatNumberWithCommas(simpleTokenScheme.meltedTokens);
+    const maximumSupply = formatNumberWithCommas(BigInt(simpleTokenScheme.maximumSupply));
+    const mintedTokens = formatNumberWithCommas(BigInt(simpleTokenScheme.mintedTokens));
+    const meltedTokens = formatNumberWithCommas(BigInt(simpleTokenScheme.meltedTokens));
 
     return (
         <div className="token-info">
diff --git a/client/src/services/identityService.ts b/client/src/services/identityService.ts
index 887eea416..2c5f861f3 100644
--- a/client/src/services/identityService.ts
+++ b/client/src/services/identityService.ts
@@ -9,6 +9,8 @@ import { CHRYSALIS, STARDUST } from "~models/config/protocolVersion";
 import * as identity from "@iota/identity-wasm/web";
 
 export class IdentityService {
+    private initLibraryPromise: Promise<void> | undefined;
+
     /**
      * Resolves DID into it's DID document (Chrysalis).
      * @param  {string} did DID to be resolved
@@ -66,6 +68,10 @@ export class IdentityService {
     }
 
     public async initLibrary(path = "/wasm/identity_wasm_bg.wasm") {
-        return await identity.init(path);
+        if (!this.initLibraryPromise) {
+            this.initLibraryPromise = identity.init(path);
+        }
+
+        return this.initLibraryPromise;
     }
 }
diff --git a/package.json b/package.json
index ce1d1e301..2dfbff78c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
         "setup:dev": "npm run clear && npm run prepare && npm run setup:client && npm run setup:api",
         "clear": "rimraf api/node_modules api/dist client/node_modules client/build",
         "dev": "concurrently 'cd api && npm run start-dev' 'cd client && npm run start'",
-        "pre-push": "concurrently 'cd api && npm run build-compile && npm run build-lint && npm run build-config' 'cd client && npm run build'",
         "prepare": "husky install",
         "format": "concurrently 'cd api && npm run format' 'cd client && npm run format'"
     },