diff --git a/Automation/Modules/Tuneup/Modules/Xhtml/Configs/cleanup-before.sed b/Automation/Modules/Tuneup/Modules/Xhtml/Configs/cleanup-before.sed
index 3e8e27d..80eb2b5 100644
--- a/Automation/Modules/Tuneup/Modules/Xhtml/Configs/cleanup-before.sed
+++ b/Automation/Modules/Tuneup/Modules/Xhtml/Configs/cleanup-before.sed
@@ -27,6 +27,11 @@
 #
 ######################################################################
 
+# Remove HTML preable, if any. It will be added later by xmllint,
+# based on its own interpretation of the document.
+/<?xml/d
+/<!DOCTYPE/,/>{1}/d
+
 # Convert Mailman-specific tags into comments. These tags are found in
 # Mailman's templates and should not be touched in any way because
 # they are used to display dynamic content at Mailman's run time.
diff --git a/Automation/Modules/Tuneup/Modules/Xhtml/xhtml_setToc.sh b/Automation/Modules/Tuneup/Modules/Xhtml/xhtml_setToc.sh
index 5b676d1..5b5a6cb 100755
--- a/Automation/Modules/Tuneup/Modules/Xhtml/xhtml_setToc.sh
+++ b/Automation/Modules/Tuneup/Modules/Xhtml/xhtml_setToc.sh
@@ -60,10 +60,10 @@ function xhtml_setToc {
 
     # Define table of content configuration file, the file used to
     # produce the table of content XHTML output code.
-    local TOC_CONFIG=${TUNEUP_CONFIG_DIR}/toc.awk
+    local TOC_CONFIG=${MODULE_DIR_CONFIGS}/toc.awk
 
     # Verify table of content configuration file.
-    cli_checkFiles -e ${TOC_CONFIG}
+    tcar_checkFiles -ef ${TOC_CONFIG}
 
     # Define html heading regular expression pattern. Use parenthisis
     # to save html action name, action value, and heading title.