diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 47bde68..8630694 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -1218,7 +1218,7 @@ const DomandaEditInstructorManager = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1228,10 +1228,7 @@ const DomandaEditInstructorManager = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 24d81c9..ceb7269 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -1218,7 +1218,7 @@ const DomandaEditPreInstructor = () => {
                     disabled={!isAdmissible
                         || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || evaluationBlockedForUser(data)
-                        || (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
+                        || (APP_EVALUATION_FLOW_ID === '1' && !['AWAITING_TECHNICAL_EVALUATION'].includes(data.applicationStatus))
                         || connectedSoccorsoId !== 0
                     }
                     onClick={initiateApproving}
@@ -1228,10 +1228,7 @@ const DomandaEditPreInstructor = () => {
                 ? <Button
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
-                        || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
-                                || evaluationBlockedForUser(data)))
-                    }
+                        || evaluationBlockedForUser(data)}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
                     icon="pi pi-times" iconPos="right"/> : null}
diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js
index b8faa2b..56647cb 100644
--- a/src/pages/SoccorsoEditInstructorManager/index.js
+++ b/src/pages/SoccorsoEditInstructorManager/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType])
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType])  && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditInstructorManager = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}
 
@@ -554,7 +555,7 @@ const SoccorsoEditInstructorManager = () => {
                         <Button
                             type="button"
                             onClick={openCloseAmendmentDialog}
-                            disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
+                            disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
                             label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
                             icon="pi pi-times" iconPos="right"/>
                     </div>
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 15d16d0..345752c 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
                     </div> : null}
 
                 {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
-                && amendmentRequestedDocs[data.amendmentDocumentType])
+                && !isNil(amendmentRequestedDocs[data.amendmentDocumentType]))
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditPreInstructor = () => {
                                                                style={{ flexDirection: 'row' }}>
                                 <span>{o.label}</span>
                             </li>) : null}
-                            {amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
+                            {!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
+                                ? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
                                                                                        style={{ flexDirection: 'row' }}>
                                 <span>{v}</span>
-                            </li>)}
+                            </li>) : null}
                         </ol>
                     </div> : null}
 
@@ -554,7 +555,7 @@ const SoccorsoEditPreInstructor = () => {
                         <Button
                             type="button"
                             onClick={openCloseAmendmentDialog}
-                            disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
+                            disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
                             label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
                             icon="pi pi-times" iconPos="right"/>
                     </div>