diff --git a/src/components/c2d/compute_engine_docker.ts b/src/components/c2d/compute_engine_docker.ts
index 68c65a30b..97bf2a748 100644
--- a/src/components/c2d/compute_engine_docker.ts
+++ b/src/components/c2d/compute_engine_docker.ts
@@ -131,7 +131,7 @@ export class C2DEngineDocker extends C2DEngine {
             envConfig.fees[feeChain][i].prices.length > 0
           ) {
             if (!envConfig.fees[feeChain][i].feeToken) {
-              const tokenAddress = await getOceanTokenAddressForChain(parseInt(feeChain))
+              const tokenAddress = getOceanTokenAddressForChain(parseInt(feeChain))
               if (tokenAddress) {
                 envConfig.fees[feeChain][i].feeToken = tokenAddress
                 tmpFees.push(envConfig.fees[feeChain][i])
@@ -937,7 +937,7 @@ export class C2DEngineDocker extends C2DEngine {
       }
       // resources are now available, let's start the job
       const { algorithm } = job
-      if (algorithm.meta.container && algorithm.meta.container.dockerfile) {
+      if (algorithm?.meta.container && algorithm?.meta.container.dockerfile) {
         job.status = C2DStatusNumber.BuildImage
         job.statusText = C2DStatusText.BuildImage
         this.buildImage(job, null)
@@ -1040,7 +1040,7 @@ export class C2DEngineDocker extends C2DEngine {
         containerInfo.HostConfig.IpcMode = advancedConfig.IpcMode
       if (advancedConfig.ShmSize)
         containerInfo.HostConfig.ShmSize = advancedConfig.ShmSize
-      if (job.algorithm.meta.container.entrypoint) {
+      if (job.algorithm?.meta.container.entrypoint) {
         const newEntrypoint = job.algorithm.meta.container.entrypoint.replace(
           '$ALGO',
           'data/transformations/algorithm'
@@ -1338,7 +1338,7 @@ export class C2DEngineDocker extends C2DEngine {
       // console.error('Container not found! ' + e.message)
     }
     try {
-      const volume = await this.docker.getVolume(job.jobId + '-volume')
+      const volume = this.docker.getVolume(job.jobId + '-volume')
       if (volume) {
         try {
           await volume.remove()
@@ -1349,7 +1349,7 @@ export class C2DEngineDocker extends C2DEngine {
     } catch (e) {
       // console.error('Container volume not found! ' + e.message)
     }
-    if (job.algorithm.meta.container && job.algorithm.meta.container.dockerfile) {
+    if (job.algorithm?.meta.container && job.algorithm?.meta.container.dockerfile) {
       const image = getAlgorithmImage(job.algorithm, job.jobId)
       if (image) {
         try {
diff --git a/src/utils/address.ts b/src/utils/address.ts
index 605f634d5..9760ed3b5 100644
--- a/src/utils/address.ts
+++ b/src/utils/address.ts
@@ -30,7 +30,6 @@ export function getOceanArtifactsAdresses(): any {
  */
 export function getOceanArtifactsAdressesByChainId(chain: number): any {
   try {
-    // eslint-disable-next-line security/detect-non-literal-fs-filename
     const data = getOceanArtifactsAdresses()
     if (data) {
       const networks = Object.keys(data)
@@ -53,7 +52,7 @@ export function getOceanArtifactsAdressesByChainId(chain: number): any {
 }
 
 // eslint-disable-next-line require-await
-export function getOceanTokenAddressForChain(chainId: number): Promise<string | null> {
+export function getOceanTokenAddressForChain(chainId: number): string | null {
   const addresses = getOceanArtifactsAdressesByChainId(chainId)
   if (addresses && addresses.Ocean) return addresses.Ocean
   return null