diff --git a/packages/core/interface/src/index.ts b/packages/core/interface/src/index.ts
index 9a5ed25e..ca9e84fd 100644
--- a/packages/core/interface/src/index.ts
+++ b/packages/core/interface/src/index.ts
@@ -1,7 +1,7 @@
 import { SecurityTetraplet } from '@fluencelabs/avm';
 import type { MultiaddrInput } from '@multiformats/multiaddr';
-import { FnConfig, FunctionCallDef, ServiceDef } from './compilerSupport';
-export * from './compilerSupport';
+import { FnConfig, FunctionCallDef, ServiceDef } from './compilerSupport.js';
+export * from './compilerSupport.js';
 
 /**
  * Peer ID's id as a base58 string (multihash/CIDv0).
diff --git a/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts b/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts
index 67f42c2a..d13fb409 100644
--- a/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts
+++ b/packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts
@@ -1,4 +1,4 @@
-import { aqua2ts, ts2aqua } from '../conversions';
+import { aqua2ts, ts2aqua } from '../conversions.js';
 
 const i32 = { tag: 'scalar', name: 'i32' } as const;
 
diff --git a/packages/core/js-peer/src/compilerSupport/callFunction.ts b/packages/core/js-peer/src/compilerSupport/callFunction.ts
index 35d1082e..75812574 100644
--- a/packages/core/js-peer/src/compilerSupport/callFunction.ts
+++ b/packages/core/js-peer/src/compilerSupport/callFunction.ts
@@ -5,8 +5,8 @@ import {
     NonArrowType,
     getArgumentTypes,
     isReturnTypeVoid,
+    IFluencePeer,
 } from '@fluencelabs/interface';
-import { IFluencePeer } from '@fluencelabs/interface';
 
 import {
     injectRelayService,
diff --git a/packages/core/js-peer/src/compilerSupport/conversions.ts b/packages/core/js-peer/src/compilerSupport/conversions.ts
index d1ddda82..f36044b8 100644
--- a/packages/core/js-peer/src/compilerSupport/conversions.ts
+++ b/packages/core/js-peer/src/compilerSupport/conversions.ts
@@ -1,6 +1,6 @@
 import { jsonify } from '../js-peer/utils.js';
 import { match } from 'ts-pattern';
-import { ArrowType, ArrowWithoutCallbacks, NonArrowType } from '@fluencelabs/interface';
+import type { ArrowType, ArrowWithoutCallbacks, NonArrowType } from '@fluencelabs/interface';
 import { CallServiceData } from '../interfaces/commonTypes.js';
 
 /**
@@ -103,6 +103,7 @@ export const ts2aqua = (value: any, type: NonArrowType): any => {
                 return [ts2aqua(value, opt.type)];
             }
         })
+        // @ts-ignore
         .with({ tag: 'scalar' }, { tag: 'bottomType' }, { tag: 'topType' }, () => {
             return value;
         })
diff --git a/packages/core/js-peer/src/compilerSupport/registerService.ts b/packages/core/js-peer/src/compilerSupport/registerService.ts
index 75f895af..3e96462a 100644
--- a/packages/core/js-peer/src/compilerSupport/registerService.ts
+++ b/packages/core/js-peer/src/compilerSupport/registerService.ts
@@ -1,5 +1,4 @@
-import { IFluencePeer } from '@fluencelabs/interface';
-import { ServiceDef } from '@fluencelabs/interface';
+import type { IFluencePeer, ServiceDef } from '@fluencelabs/interface';
 import { registerGlobalService, userHandlerService } from './services.js';
 
 export const registerServiceImpl = (
diff --git a/packages/core/js-peer/src/compilerSupport/services.ts b/packages/core/js-peer/src/compilerSupport/services.ts
index 31a3878a..41bc8d85 100644
--- a/packages/core/js-peer/src/compilerSupport/services.ts
+++ b/packages/core/js-peer/src/compilerSupport/services.ts
@@ -3,10 +3,16 @@ import { match } from 'ts-pattern';
 
 import { Particle } from '../js-peer/Particle.js';
 import { CallServiceData, GenericCallServiceHandler, ResultCodes } from '../interfaces/commonTypes.js';
-import { IFluencePeer, CallParams } from '@fluencelabs/interface';
 
 import { aquaArgs2Ts, responseServiceValue2ts, returnType2Aqua, ts2aqua } from './conversions.js';
-import { ArrowWithoutCallbacks, FunctionCallConstants, FunctionCallDef, NonArrowType } from '@fluencelabs/interface';
+import {
+    IFluencePeer,
+    CallParams,
+    ArrowWithoutCallbacks,
+    FunctionCallConstants,
+    FunctionCallDef,
+    NonArrowType,
+} from '@fluencelabs/interface';
 
 export interface ServiceDescription {
     serviceId: string;