diff --git a/docs/faq.md b/docs/faq.md
index 41bc86901d6b39a1d26f86b79a760856931bdd9d..316c287a3e78df44e31bb52bddf5e9e168c44d30 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -5,9 +5,9 @@ The following NMaaS-related questions are answered on this page:
 - [How can I contact the NMaaS Team members?](#how-can-i-contact-the-nmaas-team-members)
 - [How can I test NMaaS?](#how-can-i-test-nmaas)
 - [How can I start monitoring my infrastructure with NMaaS?](#how-can-i-start-monitoring-my-infrastructure-with-nmaas)
-- [How can I request creation of new NMaaS domain for my NREN / Institution / Project?](#how-can-i-request-creation-of-new-nmaas-domain-for-my-nren-institution-project)
+- [How can I request creation of new NMaaS domain for my NREN / Institution / Project?](#how-can-i-request-creation-of-new-nmaas-domain-for-my-nreninstitutionproject)
 - [How can I deploy NMaaS on my own intrastructure?](#how-can-i-deploy-nmaas-on-my-own-infrastructure)
-- [Where can I find NMaaS User Guide?](#where-can-i-find-nmaas-userg-uide)
+- [Where can I find NMaaS User Guide?](#where-can-i-find-nmaas-user-guide)
 - [Where can I find NMaaS Administrator Guide?](#where-can-i-find-nmaas-administrator-guide)
 - [What applications are currently supported by NMaaS?](#what-applications-are-currently-supported-by-nmaas)
 - [What type of VPNs are established by NMaaS?](#what-type-of-vpns-are-established-by-nmaas)
diff --git a/docs/nmaas-applications/tutorials/booked.md b/docs/nmaas-applications/tutorials/booked.md
index a6de92313697ffadf429922092c2a2ca6132ab2f..1ef1adb38fbda16f197d7e67c32f7ef6b8637776 100644
--- a/docs/nmaas-applications/tutorials/booked.md
+++ b/docs/nmaas-applications/tutorials/booked.md
@@ -11,7 +11,7 @@ A web-based calendar and resource scheduling system that allows administered man
 
 ## Default Credentials
 
-As stated in the [Customizable Parameters](#customizable-parameters) section, the admin username is the administrator's email address that is specified during the deployment process directly from the NMaaS web interface. The default password is simply `password`. Users are strongly encouraged to change the default password of their admin accounts after the initial login.
+As stated in the [Base tab](#base-tab) section, the admin username is the administrator's email address that is specified during the deployment process directly from the NMaaS web interface. The default password is simply `password`. Users are strongly encouraged to change the default password of their admin accounts after the initial login.
 
 ## Configuration wizard
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 30ad3bca98550c42262483628f3eb74c9e119f2b..e084f715d3b9cd7605a49da1aeab0aba2ba3838f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -135,9 +135,8 @@ markdown_extensions:
   - pymdownx.critic
   - pymdownx.details
   - pymdownx.emoji:
-      emoji_generator: !!python/name:pymdownx.emoji.to_svg
-      emoji_index: !!python/name:materialx.emoji.twemoji
-      emoji_generator: !!python/name:materialx.emoji.to_svg
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
   - pymdownx.inlinehilite
   - pymdownx.magiclink
   - pymdownx.mark