diff --git a/phpdotnet/phd/Format.php b/phpdotnet/phd/Format.php
index 3f8b8deb..2317deba 100644
--- a/phpdotnet/phd/Format.php
+++ b/phpdotnet/phd/Format.php
@@ -55,6 +55,13 @@ abstract class Format extends ObjectStorage
     /* Table handling */
     protected $TABLE = array();
 
+    /**
+    * Name of the ID currently being processed
+    *
+    * @var string
+    */
+    protected $CURRENT_ID = "";
+
     public function __construct() {
         $sqlite = Config::indexcache();
         if (!$sqlite) {
diff --git a/phpdotnet/phd/Options/Parser.php b/phpdotnet/phd/Options/Parser.php
index a2934f98..8bb483cc 100644
--- a/phpdotnet/phd/Options/Parser.php
+++ b/phpdotnet/phd/Options/Parser.php
@@ -81,7 +81,7 @@ private function checkOptions() {
             $checkArgv = explode('=', $argv[$i]);
             if (substr($checkArgv[0], 0, 2) == '--') {
                 if (!in_array(substr($checkArgv[0], 2), $long)) {
-                    trigger_error('Invalid long option ' . $argv[$i] . ' ' . $check, E_USER_ERROR);
+                    trigger_error('Invalid long option ' . $argv[$i], E_USER_ERROR);
                 }
             } elseif (substr($checkArgv[0], 0, 1) == '-') {
                 if (!in_array(substr($checkArgv[0], 1), $short)) {
diff --git a/phpdotnet/phd/Package/Generic/XHTML.php b/phpdotnet/phd/Package/Generic/XHTML.php
index fc99d221..256aa71a 100644
--- a/phpdotnet/phd/Package/Generic/XHTML.php
+++ b/phpdotnet/phd/Package/Generic/XHTML.php
@@ -1,7 +1,6 @@
 <?php
 namespace phpdotnet\phd;
 
-#[\AllowDynamicProperties]
 abstract class Package_Generic_XHTML extends Format_Abstract_XHTML {
     private $myelementmap = array( /* {{{ */
         'abstract'              => 'div', /* Docbook-xsl prints "abstract"... */
@@ -449,6 +448,15 @@ abstract class Package_Generic_XHTML extends Format_Abstract_XHTML {
         'titleabbrev'           => 'format_suppressed_text',
     );
 
+    /** @var array */
+    protected $TOC_WRITTEN = [];
+
+    /** @var string */
+    protected $CURRENT_LANG = "";
+
+    /** @var string */
+    protected $CURRENT_CHUNK = "";
+
      /* Current Chunk variables */
     protected $cchunk      = array();
     /* Default Chunk variables */
diff --git a/phpdotnet/phd/Package/PEAR/XHTML.php b/phpdotnet/phd/Package/PEAR/XHTML.php
index 5aaf337c..5fd02475 100755
--- a/phpdotnet/phd/Package/PEAR/XHTML.php
+++ b/phpdotnet/phd/Package/PEAR/XHTML.php
@@ -362,13 +362,6 @@ abstract class Package_PEAR_XHTML extends Package_Generic_XHTML {
     */
     public $phd_pearapi_urlprefix = 'http://pear.php.net/package/';
 
-    /**
-    * Name of the ID currently being processed
-    *
-    * @var string
-    */
-    protected $CURRENT_ID = "";
-
     /* Current Chunk settings */
     protected $cchunk          = array();
     /* Default Chunk settings */
diff --git a/phpdotnet/phd/Package/PHP/Manpage.php b/phpdotnet/phd/Package/PHP/Manpage.php
index 1408ad8a..32aac961 100644
--- a/phpdotnet/phd/Package/PHP/Manpage.php
+++ b/phpdotnet/phd/Package/PHP/Manpage.php
@@ -32,8 +32,6 @@ class Package_PHP_Manpage extends Package_Generic_Manpage {
         ),
     );
 
-    protected $CURRENT_ID = "";
-
     /* Current Chunk settings */
     protected $cchunk          = array();
     /* Default Chunk settings */
diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
index cf96c737..7c59b05b 100644
--- a/phpdotnet/phd/Package/PHP/XHTML.php
+++ b/phpdotnet/phd/Package/PHP/XHTML.php
@@ -148,8 +148,6 @@ abstract class Package_PHP_XHTML extends Package_Generic_XHTML {
     private $versions = array();
     private $acronyms = array();
     protected $deprecated = array();
-    protected $CURRENT_ID;
-    protected $CURRENT_CHUNK;
 
     /* Current Chunk settings */
     protected $cchunk          = array();