diff --git a/README b/README
index 7549819..7e58c9a 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ About
 -----
 This plugin for OJS 3 provides an import/export plugin to generate metadata information for articles
 and issues for indexing in CrossRef. Details on the XML format and data requirements is available at:
-http://www.crossref.org/schema
+https://www.crossref.org/documentation/schema-library/
 
 License
 -------
diff --git a/filter/ArticleCrossrefXmlFilter.inc.php b/filter/ArticleCrossrefXmlFilter.inc.php
index 4167a6d..61ea967 100644
--- a/filter/ArticleCrossrefXmlFilter.inc.php
+++ b/filter/ArticleCrossrefXmlFilter.inc.php
@@ -142,7 +142,9 @@ public function createJournalArticleNode($doc, $submission)
                 $personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'given_name', htmlspecialchars(ucfirst($givenNames[$locale]), ENT_COMPAT, 'UTF-8')));
                 $personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'surname', htmlspecialchars(ucfirst($familyNames[$locale]), ENT_COMPAT, 'UTF-8')));
                 $hasAltName = false;
-
+                if ($author->getData('affiliation')) {
+				$personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'affiliation', htmlspecialchars(ucfirst($author->getLocalizedAffiliation()), ENT_COMPAT, 'UTF-8')));
+				}
                 if ($author->getData('orcid')) {
                     $personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'ORCID', $author->getData('orcid')));
                 }
diff --git a/filter/IssueCrossrefXmlFilter.inc.php b/filter/IssueCrossrefXmlFilter.inc.php
index af75af9..abc45cc 100644
--- a/filter/IssueCrossrefXmlFilter.inc.php
+++ b/filter/IssueCrossrefXmlFilter.inc.php
@@ -188,7 +188,7 @@ function createJournalIssueNode($doc, $issue) {
 			$journalVolumeNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'volume', htmlspecialchars($issue->getVolume(), ENT_COMPAT, 'UTF-8')));
 			$journalIssueNode->appendChild($journalVolumeNode);
 		}
-		if ($issue->getNumber() && $issue->getShowNumber()) {
+		if ($issue->getNumber()) {
 			$journalIssueNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'issue', htmlspecialchars($issue->getNumber(), ENT_COMPAT, 'UTF-8')));
 		}
 		if ($issue->getDatePublished() && $issue->getStoredPubId('doi')) {