diff --git a/src/core_modules/capture-core/components/Widget/widgetCollapsible.types.js b/src/core_modules/capture-core/components/Widget/widgetCollapsible.types.js
index 3f182d8f8e..6392f0fc94 100644
--- a/src/core_modules/capture-core/components/Widget/widgetCollapsible.types.js
+++ b/src/core_modules/capture-core/components/Widget/widgetCollapsible.types.js
@@ -2,7 +2,7 @@
 import type { Node } from 'react';
 
 export type WidgetCollapsibleProps = {|
-    header: Node,
+    header?: Node,
     children: Node,
     open: boolean,
     onOpen: () => void,
diff --git a/src/core_modules/capture-core/components/Widget/widgetNonCollapsible.types.js b/src/core_modules/capture-core/components/Widget/widgetNonCollapsible.types.js
index 3af55c409b..4e1e8e4f3d 100644
--- a/src/core_modules/capture-core/components/Widget/widgetNonCollapsible.types.js
+++ b/src/core_modules/capture-core/components/Widget/widgetNonCollapsible.types.js
@@ -2,7 +2,7 @@
 import type { Node } from 'react';
 
 export type WidgetNonCollapsibleProps = {|
-    header: Node,
+    header?: Node,
     children: Node,
     color?: string,
     borderless?: boolean,
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js
index d775ecae20..9f8c790587 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js
@@ -17,7 +17,7 @@ import { InfoBox } from '../InfoBox';
 import { baseInputStyles } from '../ScheduleOrgUnit/commonProps';
 
 
-const ScheduleDataField = withDefaultFieldContainer()(
+const ScheduleDateField = withDefaultFieldContainer()(
     withLabel({
         onGetCustomFieldLabeClass: () => labelTypeClasses.dateLabel,
     })(
@@ -57,7 +57,7 @@ const ScheduleDatePlain = ({
 }: Props) => (
     <div className={classes.fieldWrapper}>
         {!hideDueDate ?
-            <ScheduleDataField
+            <ScheduleDateField
                 label={i18n.t('Schedule date / Due date')}
                 required
                 value={scheduleDate}
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/dataEntryFieldLabels.module.css b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/dataEntryFieldLabels.module.css
index f4cae64aa1..c795dd8efc 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/dataEntryFieldLabels.module.css
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/dataEntryFieldLabels.module.css
@@ -1,3 +1,3 @@
 .dateLabel {
     padding-top: 13px;
-}
\ No newline at end of file
+}
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleOrgUnit/dataEntryFieldLabels.module.css b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleOrgUnit/dataEntryFieldLabels.module.css
index f4cae64aa1..c795dd8efc 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleOrgUnit/dataEntryFieldLabels.module.css
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleOrgUnit/dataEntryFieldLabels.module.css
@@ -1,3 +1,3 @@
 .dateLabel {
     padding-top: 13px;
-}
\ No newline at end of file
+}
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js
index 7d4b8f6919..a86780b8c4 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js
@@ -70,9 +70,6 @@ const WidgetEventSchedulePlain = ({
         <Widget
             noncollapsible
             borderless
-            header={
-                <></>
-            }
         >
             <div className={classes.wrapper}>
                 <DataSection
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
index c6ecee2a48..0ca4cd2d70 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
@@ -188,7 +188,7 @@ export const WidgetEventSchedule = ({
             onCancel={onCancel}
             setScheduleDate={setScheduleDate}
             setScheduledOrgUnit={setScheduledOrgUnit}
-            setIsFormValid={setIsFormValid} // Viktig å beholde
+            setIsFormValid={setIsFormValid}
             onSchedule={onHandleSchedule}
             onAddNote={onAddNote}
             eventCountInOrgUnit={eventCountInOrgUnit}
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.js b/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.js
index 72f3f7d54d..3ba2bc967a 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.js
@@ -36,7 +36,11 @@ export type Props = {|
    scheduleDate?: ?string,
    serverScheduleDate?: ?string,
    suggestedScheduleDate?: ?string,
-   setScheduledOrgUnit: (orgUnit: Object) => void,
+   setScheduledOrgUnit: (orgUnit: ?{
+      id: string,
+      name: string,
+      path: string,
+  }) => void,
    setIsFormValid: (valid: boolean) => void,
    serverSuggestedScheduleDate?: ?string,
    eventCountInOrgUnit: number,