diff --git a/packages/address-validator/src/crypto/cnBase58.js b/packages/address-validator/src/crypto/cnBase58.js
index 490a37548a8..32e91d388de 100644
--- a/packages/address-validator/src/crypto/cnBase58.js
+++ b/packages/address-validator/src/crypto/cnBase58.js
@@ -1,4 +1,5 @@
-var JSBigInt = require('./biginteger')['JSBigInt'];
+var moduleImport = require('./biginteger');
+var JSBigInt = moduleImport.JSBigInt;
 
 /**
 Copyright (c) 2017, moneroexamples
diff --git a/packages/connect-web/src/module/index.ts b/packages/connect-web/src/module/index.ts
index 76f3c33dc43..02c4d433cb3 100644
--- a/packages/connect-web/src/module/index.ts
+++ b/packages/connect-web/src/module/index.ts
@@ -80,6 +80,8 @@ const TrezorConnect = factory(
 export default TrezorConnect;
 export * from '@trezor/connect/src/exports';
 
-window.addEventListener('beforeunload', () => {
-    impl.dispose();
-});
+if (typeof window !== 'undefined') {
+    window.addEventListener('beforeunload', () => {
+        impl.dispose();
+    });
+}