diff --git a/Services/COPage/DOM/class.DomUtil.php b/Services/COPage/DOM/class.DomUtil.php
index 762b53810a93..ee589f4f963e 100644
--- a/Services/COPage/DOM/class.DomUtil.php
+++ b/Services/COPage/DOM/class.DomUtil.php
@@ -145,8 +145,8 @@ public function deleteAllChildsByName(
     public function deleteAllChilds(
         \DOMNode $parent
     ): void {
-        foreach ($parent->childNodes as $child) {
-            $parent->removeChild($child);
+        while ($parent->hasChildNodes()) {
+            $parent->removeChild($parent->firstChild);
         }
     }
 
diff --git a/Services/COPage/PC/Paragraph/class.ilPCParagraph.php b/Services/COPage/PC/Paragraph/class.ilPCParagraph.php
index b18cdca7050f..64295fb2aaf4 100755
--- a/Services/COPage/PC/Paragraph/class.ilPCParagraph.php
+++ b/Services/COPage/PC/Paragraph/class.ilPCParagraph.php
@@ -162,7 +162,6 @@ public function setText(
         $error = $this->checkTextArray($text);
 
         $orig_characteristic = "";
-
         // remove all childs
         if (empty($error)) {
             $t = $text[0]["text"] ?? "";
diff --git a/Services/COPage/PC/SourceCode/class.SourceCodeCommandActionHandler.php b/Services/COPage/PC/SourceCode/class.SourceCodeCommandActionHandler.php
index 08fe37da191b..f2758ccbc73b 100644
--- a/Services/COPage/PC/SourceCode/class.SourceCodeCommandActionHandler.php
+++ b/Services/COPage/PC/SourceCode/class.SourceCodeCommandActionHandler.php
@@ -69,8 +69,7 @@ protected function insertCommand(array $body): Server\Response
             $hier_id = $hier_ids[$body["after_pcid"]];
             $pc_id = $body["after_pcid"];
         }
-
-        $manual = ((string) ($body["form_input_1"] ?? "") === "manual");
+        $manual = ((string) ($body["form/input_0"] ?? "") === "manual");
 
         $src = new \ilPCSourceCode($page);
         $src->create($page, $hier_id, $pc_id);
@@ -113,7 +112,6 @@ protected function updateCommand(array $body): Server\Response
         /** @var \ilPCSourceCode $pc_src */
         $pc_src = $page->getContentObjectForPcId($body["pcid"]);
         $src_gui = new \ilPCSourceCodeGUI($page, $pc_src, "", $body["pcid"]);
-
         $form = $src_gui->getEditingFormAdapter();
         if ($form->isValid()) {
             $pc_src->setDownloadTitle(str_replace('"', '', $form->getData("title")));
diff --git a/Services/COPage/PC/SourceCode/class.ilPCSourceCode.php b/Services/COPage/PC/SourceCode/class.ilPCSourceCode.php
index d5b51018c214..2f8d1b776875 100755
--- a/Services/COPage/PC/SourceCode/class.ilPCSourceCode.php
+++ b/Services/COPage/PC/SourceCode/class.ilPCSourceCode.php
@@ -46,7 +46,8 @@ public function modifyPageContentPostXsl(
         foreach ($nodes as $context_node) {
             $char = $context_node->getAttribute('Characteristic');
 
-            if ($char != "Code") {
+            if ($char !== "Code") {
+                $i++;
                 continue;
             }
 
diff --git a/Services/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php b/Services/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php
index 7b4f3aee976d..c9770d901c91 100755
--- a/Services/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php
+++ b/Services/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php
@@ -113,8 +113,7 @@ public function edit(): void
                                     $this->lng->txt("cont_pc_code")
                                 )->withValue($par_content);
         $t = $this->gui->ui()->renderer()->render($f);
-        $t = str_replace("<textarea ", "<textarea name='code' rows='20' form='copg-src-form' ", $t);
-
+        $t = str_replace("<textarea", "<textarea name='code' rows='20' form='copg-src-form' ", $t);
         $this->tpl->setContent($t . $this->getEditorScriptTag($this->pc_id, "SourceCode"));
     }
 
diff --git a/Services/COPage/PC/Table/class.TableCommandActionHandler.php b/Services/COPage/PC/Table/class.TableCommandActionHandler.php
index 2f1fa8b12783..184ef4120433 100644
--- a/Services/COPage/PC/Table/class.TableCommandActionHandler.php
+++ b/Services/COPage/PC/Table/class.TableCommandActionHandler.php
@@ -382,27 +382,27 @@ protected function setCellProperties(array $body): Server\Response
                         if (isset($body["style_cb"])) {
                             $class = $body["style"] ?? "";
                             if ($class === "") {
-                                $td_node->remove_attribute("Class");
+                                $td_node->removeAttribute("Class");
                             } else {
-                                $td_node->set_attribute("Class", $class);
+                                $td_node->setAttribute("Class", $class);
                             }
                         }
                         // set width
                         if (isset($body["width_cb"])) {
                             $width = $body["width"] ?? "";
                             if ($width === "") {
-                                $td_node->remove_attribute("Width");
+                                $td_node->removeAttribute("Width");
                             } else {
-                                $td_node->set_attribute("Width", $width);
+                                $td_node->setAttribute("Width", $width);
                             }
                         }
                         // set alignment
                         if (isset($body["al_cb"])) {
                             $alignment = $body["alignment"] ?? "";
                             if ($alignment === "") {
-                                $td_node->remove_attribute("HorizontalAlign");
+                                $td_node->removeAttribute("HorizontalAlign");
                             } else {
-                                $td_node->set_attribute("HorizontalAlign", $alignment);
+                                $td_node->setAttribute("HorizontalAlign", $alignment);
                             }
                         }
 
@@ -428,8 +428,8 @@ protected function toggleMerge(array $body): Server\Response
         $right = (int) ($data["right"] ?? -1);
 
         $td_node = $tab->getTableDataNode($top, $left);
-        $td_node->set_attribute("ColSpan", $right - $left + 1);
-        $td_node->set_attribute("RowSpan", $bottom - $top + 1);
+        $td_node->setAttribute("ColSpan", $right - $left + 1);
+        $td_node->setAttribute("RowSpan", $bottom - $top + 1);
 
         $tab->fixHideAndSpans();
 
diff --git a/Services/COPage/PC/Table/class.ilPCDataTableGUI.php b/Services/COPage/PC/Table/class.ilPCDataTableGUI.php
index b02202b1da18..4f1ca9eb14d9 100755
--- a/Services/COPage/PC/Table/class.ilPCDataTableGUI.php
+++ b/Services/COPage/PC/Table/class.ilPCDataTableGUI.php
@@ -274,7 +274,6 @@ protected function getCellContent(int $i, int $j): string
                 true,
                 false
             );
-            include_once("./Services/COPage/classes/class.ilPCParagraphGUI.php");
             $s_text = ilPCParagraphGUI::xml2outputJS(
                 $s_text,
                 "TableContent",
diff --git a/Services/COPage/PC/Table/class.ilPCTable.php b/Services/COPage/PC/Table/class.ilPCTable.php
index 4a37355fef62..cdb9dc0c6a36 100755
--- a/Services/COPage/PC/Table/class.ilPCTable.php
+++ b/Services/COPage/PC/Table/class.ilPCTable.php
@@ -134,15 +134,14 @@ public function getCellNode(int $i, int $j, bool $create_if_not_exists = false):
     /**
      * Get cell paragraph node of row $i and cell $j
      */
-    public function getTableDataNode(int $i, int $j): ?php4DOMElement
+    public function getTableDataNode(int $i, int $j): ?DOMElement
     {
-        $xpc = xpath_new_context($this->dom);
         $path = "//PageContent[@HierId='" . $this->getHierId() . "']" .
             "/Table/TableRow[$i+1]/TableData[$j+1]";
-        $res = xpath_eval($xpc, $path);
+        $nodes = $this->dom_util->path($this->dom_doc, $path);
 
-        if (isset($res->nodeset[0])) {
-            return $res->nodeset[0];
+        if (count($nodes) > 0) {
+            return $nodes->item(0);
         }
         return null;
     }
diff --git a/Services/COPage/PC/Table/class.ilPCTableGUI.php b/Services/COPage/PC/Table/class.ilPCTableGUI.php
index 55e63e66225d..11440daa9f06 100755
--- a/Services/COPage/PC/Table/class.ilPCTableGUI.php
+++ b/Services/COPage/PC/Table/class.ilPCTableGUI.php
@@ -1073,12 +1073,14 @@ public function getEditDataTable(bool $initial = false): string
             "/Table/TableRow";
         $nodes = $this->dom_util->path($this->dom, $path);
         $i = 0;
+        $total_rows = count($nodes);
         foreach ($nodes as $node) {
             $path2 = "//PageContent[@HierId='" . $this->getHierId() . "']" .
                 "/Table/TableRow[$i+1]/TableData";
             $nodes2 = $this->dom_util->path($this->dom, $path2);
             // if this is the first row -> col icons
             if ($i == 0) {
+                $total_cols = count($nodes2);
                 $j = 0;
                 foreach ($nodes2 as $node2) {
                     if ($j == 0) {
diff --git a/Services/COPage/PC/Tabs/class.ilPCTabs.php b/Services/COPage/PC/Tabs/class.ilPCTabs.php
index 1ba23bf1fd41..b862db45b090 100755
--- a/Services/COPage/PC/Tabs/class.ilPCTabs.php
+++ b/Services/COPage/PC/Tabs/class.ilPCTabs.php
@@ -271,22 +271,21 @@ public function getCssFiles(string $a_mode): array
 
     public function saveCaption(string $pc_id, string $caption): void
     {
-        $tab_nodes = $this->tabs_node->child_nodes();
-        for ($i = 0; $i < count($tab_nodes); $i++) {
-            if ($tab_nodes[$i]->node_name() == "Tab") {
-                $current_pc_id = $tab_nodes[$i]->get_attribute("PCID");
+        $tab_nodes = $this->getChildNode()->childNodes;
+        foreach ($tab_nodes as $tab_node) {
+            if ($tab_node->nodeName === "Tab") {
+                $current_pc_id = $tab_node->getAttribute("PCID");
                 if ($current_pc_id === $pc_id) {
                     if ($caption !== "") {
-                        ilDOMUtil::setFirstOptionalElement(
-                            $this->dom,
-                            $tab_nodes[$i],
+                        $this->dom_util->setFirstOptionalElement(
+                            $tab_node,
                             "TabCaption",
-                            array(),
+                            [],
                             $caption,
-                            array()
+                            []
                         );
                     } else {
-                        ilDOMUtil::deleteAllChildsByName($tab_nodes[$i], array("TabCaption"));
+                        $this->dom_util->deleteAllChildsByName($tab_node, ["TabCaption"]);
                     }
                 }
             }
diff --git a/Services/COPage/classes/class.ilPageObject.php b/Services/COPage/classes/class.ilPageObject.php
index ed53d5bea494..bec776208945 100755
--- a/Services/COPage/classes/class.ilPageObject.php
+++ b/Services/COPage/classes/class.ilPageObject.php
@@ -736,6 +736,11 @@ public function getContentDomNode(string $a_hier_id, string $a_pc_id = ""): ?DOM
         return $cm->getContentDomNode($a_hier_id, $a_pc_id);
     }
 
+    public function getDomNodeForPCId(string $pc_id): ?DOMNode
+    {
+        return $this->getContentDomNode("", $pc_id);
+    }
+
     /**
      * set xml content of page, start with <PageObject...>,
      * end with </PageObject>, comply with ILIAS DTD, omit MetaData, use utf-8!