diff --git a/packages/component-faraday-ui/src/AuthorTag.js b/packages/component-faraday-ui/src/AuthorTag.js
index f3e6a1b1e09b6b68d5fee8196e01c942f64e9ba5..43a973a322bbab93891d849468d0383e0995ce03 100644
--- a/packages/component-faraday-ui/src/AuthorTag.js
+++ b/packages/component-faraday-ui/src/AuthorTag.js
@@ -31,6 +31,7 @@ const Root = styled.div`
   height: calc(${th('gridUnit')} * 3);
 
   margin-left: calc(${th('gridUnit')} / 2);
+  margin-right: calc(${th('gridUnit')} / 4);
 
   ${Tag} {
     margin-left: calc(${th('gridUnit')} / 2);
diff --git a/packages/component-faraday-ui/src/AuthorTagList.js b/packages/component-faraday-ui/src/AuthorTagList.js
index 03b0942af1612cbe6333e1ca891b01c7e0665514..ff585788d514a0a504b2a16ec7449601e3635e05 100644
--- a/packages/component-faraday-ui/src/AuthorTagList.js
+++ b/packages/component-faraday-ui/src/AuthorTagList.js
@@ -108,32 +108,6 @@ export default compose(
       : authors,
     affiliationList:
       withAffiliations && get(parsedAffiliations, 'affiliations', []),
-    plm: authors.reduce(
-      (acc, curr) => {
-        if (acc.affiliations.includes(curr.affiliation)) {
-          acc.authors = [
-            ...acc.authors,
-            {
-              ...curr,
-              affiliationNumber:
-                acc.affiliations.findIndex(e => e === curr.affiliation) + 1,
-            },
-          ]
-        } else {
-          acc.affiliations = [...acc.affiliations, curr.affiliation]
-          acc.authors = [
-            ...acc.authors,
-            {
-              ...curr,
-              affiliationNumber:
-                acc.affiliations.findIndex(e => e === curr.affiliation) + 1,
-            },
-          ]
-        }
-        return acc
-      },
-      { affiliations: [], authors: [] },
-    ),
   })),
 )(AuthorTagList)
 
diff --git a/packages/component-wizard/src/components/StepTwo.js b/packages/component-wizard/src/components/StepTwo.js
index 932e8db2ce27303a118165173a235cbb0e951ae1..f3995d16281bc8be30a963ba2b6410f02a6bf459 100644
--- a/packages/component-wizard/src/components/StepTwo.js
+++ b/packages/component-wizard/src/components/StepTwo.js
@@ -106,7 +106,6 @@ const StepTwo = ({
       formValues={formValues}
       radioFieldName="conflicts.hasDataAvailability"
       radioLabel="Have you included a data availability statement in your manuscript?"
-      required
       tooltipContent={DataAvailabilityTooltip}
     />
     <RadioWithComments
@@ -116,7 +115,6 @@ const StepTwo = ({
       formValues={formValues}
       radioFieldName="conflicts.hasFunding"
       radioLabel="Have you provided a funding statement in your manuscript?"
-      required
       tooltipContent={FundingTooltip}
     />
   </Fragment>
diff --git a/packages/component-wizard/src/components/utils.js b/packages/component-wizard/src/components/utils.js
index 8a222fc6e6647c3fcc8ab5c7617e817efe59d10d..393554b8f2e3704bf14fe37daa2d87239270ea7d 100644
--- a/packages/component-wizard/src/components/utils.js
+++ b/packages/component-wizard/src/components/utils.js
@@ -22,8 +22,8 @@ export const setInitialValues = ({ version }) => ({
     metadata: get(version, 'metadata', {}),
     conflicts: get(version, 'conflicts', {
       hasConflicts: 'no',
-      hasDataAvailability: 'yes',
-      hasFunding: 'yes',
+      hasDataAvailability: '',
+      hasFunding: '',
     }),
     declarations: get(version, 'declarations', { agree: false }),
   },
diff --git a/packages/xpub-faraday/config/validations.js b/packages/xpub-faraday/config/validations.js
index 61b8b96978d5c6ad3ebbac28c79fa1153242a58e..542530238b2e6fef27e2c20c791079fa7aa49d4e 100644
--- a/packages/xpub-faraday/config/validations.js
+++ b/packages/xpub-faraday/config/validations.js
@@ -37,9 +37,9 @@ module.exports = {
       conflicts: Joi.object({
         hasConflicts: Joi.any().valid(['yes', 'no']),
         message: Joi.string(),
-        hasDataAvailability: Joi.any().valid(['yes', 'no']),
+        hasDataAvailability: Joi.any().valid(['yes', 'no', '']),
         dataAvailabilityMessage: Joi.string(),
-        hasFunding: Joi.any().valid(['yes', 'no']),
+        hasFunding: Joi.any().valid(['yes', 'no', '']),
         fundingMessage: Joi.string(),
       }),
       commentsToReviewers: Joi.string(),