diff --git a/src/meta/user/authorizer/canViewReview.ts b/src/meta/user/authorizer/canViewReview.ts
index 9a9d8ae07e..6255bf69de 100644
--- a/src/meta/user/authorizer/canViewReview.ts
+++ b/src/meta/user/authorizer/canViewReview.ts
@@ -44,7 +44,7 @@ const hasEditSectionPermission = (
 
   const userRole = Users.getRole(user, countryIso, cycle)
 
-  return countryStatus[userRole.role]?.includes(status) && hasCollaboratorEditSectionPermission(props)
+  return countryStatus[userRole?.role]?.includes(status) && hasCollaboratorEditSectionPermission(props)
 }
 
 /**
diff --git a/src/server/controller/cycleData/getBulkDownload/getNWFP.ts b/src/server/controller/cycleData/getBulkDownload/getNWFP.ts
index 146cc0b255..6d07f7e3a2 100644
--- a/src/server/controller/cycleData/getBulkDownload/getNWFP.ts
+++ b/src/server/controller/cycleData/getBulkDownload/getNWFP.ts
@@ -48,7 +48,7 @@ export const getNWFP = async (props: Props) => {
     }
 
     const variableSet1 = Array.from({ length: 10 }, (_, i) => `product_${i + 1}`)
-    const colSet1 = ['product_name', 'value', 'category']
+    const colSet1 = ['product_name', 'value', 'category', 'quantity', 'unit']
 
     variableSet1.forEach((variableName) => {
       colSet1.forEach((colName) => {