diff --git a/bills/billsUploadMedia.ts b/bills/billsUploadMedia.ts
index 1df3dc4..7fd4e86 100644
--- a/bills/billsUploadMedia.ts
+++ b/bills/billsUploadMedia.ts
@@ -76,6 +76,7 @@ export async function BillsUploadMedia(req: Request, res: Response) {
       BillsListMedia(req, res);
     }
   } catch (err) {
+    logger.error("Error while uploading Bill Media", req.files, err);
     res.status(500).send(err);
   }
 }
diff --git a/jobs/jobsListMedia.ts b/jobs/jobsListMedia.ts
index 8e99d6c..baf13d1 100644
--- a/jobs/jobsListMedia.ts
+++ b/jobs/jobsListMedia.ts
@@ -75,6 +75,7 @@ export async function JobsListMedia(req: Request, res: Response) {
 
     res.json(ret);
   } catch (error) {
+    logger.error("Error listing job media.", jobid, error);
     res.status(500).json(error);
   }
 }
diff --git a/jobs/jobsMoveMedia.ts b/jobs/jobsMoveMedia.ts
index 4db222a..06b0c90 100644
--- a/jobs/jobsMoveMedia.ts
+++ b/jobs/jobsMoveMedia.ts
@@ -57,6 +57,16 @@ export async function JobsMoveMedia(req: Request, res: Response) {
 
     JobsListMedia(req, res);
   } catch (err) {
+    logger.error(
+      "Error moving job media",
+      "from",
+      from_jobid,
+      "to",
+      jobid,
+      "files",
+      files,
+      err
+    );
     res.status(500).send(err);
   }
 }
diff --git a/jobs/jobsUploadMedia.ts b/jobs/jobsUploadMedia.ts
index cbea8b8..7f41ff1 100644
--- a/jobs/jobsUploadMedia.ts
+++ b/jobs/jobsUploadMedia.ts
@@ -49,6 +49,7 @@ export async function jobsUploadMedia(req: Request, res: Response) {
       JobsListMedia(req, res);
     }
   } catch (err) {
+    logger.error("Error uploading job media.", jobid, err);
     res.status(500).send(err);
   }
 }
diff --git a/server.ts b/server.ts
index 77ccb7f..cd9a582 100644
--- a/server.ts
+++ b/server.ts
@@ -107,6 +107,7 @@ app.use(bodyParser.json({ limit: "50mb" }));
 app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
 
 app.use(cors());
+
 const morganMiddleware = morgan(
   "combined", //":method :url :status :res[content-length] - :response-time ms"
   {
@@ -117,7 +118,7 @@ const morganMiddleware = morgan(
 );
 
 app.use(morganMiddleware);
-app.use(helmet());
+app.use(helmet({ crossOriginResourcePolicy: { policy: "cross-origin" } }));
 app.post("/jobs/list", ValidateImsToken, JobRequestValidator, JobsListMedia);
 app.post(
   "/jobs/upload",
diff --git a/util/generateThumbnail.ts b/util/generateThumbnail.ts
index 0e237ab..9890fa8 100644
--- a/util/generateThumbnail.ts
+++ b/util/generateThumbnail.ts
@@ -51,7 +51,7 @@ export default async function GenerateThumbnail(
     }
     return path.relative(path.dirname(file), thumbPath);
   } catch (err) {
-    console.error("Error when genenerating thumbnail:", thumbPath);
+    logger.error("Error when genenerating thumbnail:", thumbPath, err);
     return path.relative(path.dirname(file), thumbPath);
   }
 }