diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js
index 5524a7c4d..1d5e39977 100644
--- a/rdmo/core/assets/js/components/Modal.js
+++ b/rdmo/core/assets/js/components/Modal.js
@@ -40,8 +40,8 @@ Modal.propTypes = {
   submitProps: PropTypes.object,
   onClose: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
-  buttons: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  buttons: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
 }
 
 export default Modal
diff --git a/rdmo/projects/assets/js/interview/components/main/Search.js b/rdmo/projects/assets/js/interview/components/main/Search.js
index e6051c21e..0736c2ec3 100644
--- a/rdmo/projects/assets/js/interview/components/main/Search.js
+++ b/rdmo/projects/assets/js/interview/components/main/Search.js
@@ -136,7 +136,7 @@ const Search = ({ page, attribute, values, setValues, collection = false }) => {
 }
 
 Search.propTypes = {
-  page: PropTypes.number.isRequired,
+  page: PropTypes.object,
   attribute: PropTypes.number.isRequired,
   setAttribute: PropTypes.number,
   values: PropTypes.object.isRequired,
diff --git a/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js b/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js
index 13351e8f1..64f4dfa1a 100644
--- a/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js
+++ b/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 import Modal from 'rdmo/core/assets/js/components/Modal'
 
-const PageHeadDeleteModal = ({ title, name, show, onClose, onSubmit }) => {
+const PageHeadDeleteModal = ({ name, show, onClose, onSubmit }) => {
   return (
     <Modal title={gettext('Delete tab')} show={show} submitLabel={gettext('Delete')}
            submitProps={{className: 'btn btn-danger'}}
@@ -24,7 +24,6 @@ const PageHeadDeleteModal = ({ title, name, show, onClose, onSubmit }) => {
 }
 
 PageHeadDeleteModal.propTypes = {
-  title: PropTypes.string.isRequired,
   name: PropTypes.string,
   show: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
diff --git a/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js b/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js
index f77420583..ab10594c2 100644
--- a/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js
+++ b/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js
@@ -106,7 +106,7 @@ PageHeadFormModal.propTypes = {
   show: PropTypes.bool.isRequired,
   attribute: PropTypes.number,
   reuse: PropTypes.bool,
-  initial: PropTypes.object,
+  initial: PropTypes.string,
   onClose: PropTypes.func.isRequired,
   onSubmit: PropTypes.func.isRequired
 }
diff --git a/rdmo/projects/assets/js/interview/components/main/page/PageHeadReuseModal.js b/rdmo/projects/assets/js/interview/components/main/page/PageHeadReuseModal.js
index 61039a667..56f359779 100644
--- a/rdmo/projects/assets/js/interview/components/main/page/PageHeadReuseModal.js
+++ b/rdmo/projects/assets/js/interview/components/main/page/PageHeadReuseModal.js
@@ -40,7 +40,7 @@ const PageHeadReuseModal = ({ show, attribute, onClose, onSubmit }) => {
   }, [values, values.value])
 
   return (
-    <Modal title={gettext('Reuse answers')} show={show} submitLabel={gettext('Reuse')}
+    <Modal title={gettext('Reuse tab')} show={show} submitLabel={gettext('Reuse')}
            submitProps={{className: 'btn btn-primary'}}
            onClose={onClose} onSubmit={handleSubmit}>
       <div className={classNames({'form-group': true, 'has-error': errors.value })}>
@@ -61,7 +61,6 @@ const PageHeadReuseModal = ({ show, attribute, onClose, onSubmit }) => {
 }
 
 PageHeadReuseModal.propTypes = {
-  title: PropTypes.string.isRequired,
   show: PropTypes.bool.isRequired,
   attribute: PropTypes.number,
   onClose: PropTypes.func.isRequired,