diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index f4f55af4a3..857165f0e1 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -224,7 +224,7 @@ M.Class = Node:clone {
         end
         ret = {}
         for cl in self.class:inherits_get() do
-            ret[#ret + 1] = cl
+            ret[#ret + 1] = M.Class(cl)
         end
         self._cache_inhc = ret
         return ret
diff --git a/src/scripts/elua/apps/docgen/writer.lua b/src/scripts/elua/apps/docgen/writer.lua
index 4690ed7c91..59b81952a7 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -407,7 +407,8 @@ writers["dokuwiki"] = util.Object:clone {
         local hasraw, hasnote = false, false
         while tokp:tokenize() do
             local tp = tokp:type_get()
-            if notetypes[tp] then
+            local tag = notetypes[tp]
+            if tag then
                 self:write_raw(tag)
                 hasnote = true
             else