diff --git a/src/Factory/FormLayoutFactory.php b/src/Factory/FormLayoutFactory.php
index 723f079b9d..e68cecd046 100644
--- a/src/Factory/FormLayoutFactory.php
+++ b/src/Factory/FormLayoutFactory.php
@@ -230,7 +230,7 @@ private function fixFormColumns(FieldCollection $fields): void
             if ($aFormColumnIsOpen) {
                 // this is needed because fields inside columns look better when they take the
                 // entire width available; users can override this by setting custom CSS classes
-                $fieldDto->setDefaultColumns(12);
+                $fieldDto->setDefaultColumns('col-12');
             }
         }
 
diff --git a/src/Form/EventListener/FormLayoutSubscriber.php b/src/Form/EventListener/FormLayoutSubscriber.php
index 57a623f72b..85c0f740b3 100644
--- a/src/Form/EventListener/FormLayoutSubscriber.php
+++ b/src/Form/EventListener/FormLayoutSubscriber.php
@@ -31,7 +31,7 @@ public static function getSubscribedEvents(): array
     public function handleTabErrors(FormEvent $event)
     {
         $formTabs = [];
-        /** @var Form $formType */
+        /** @var Form $child */
         foreach ($event->getForm() as $child) {
             /** @var FieldDto $fieldDto */
             if (null === $fieldDto = $child->getConfig()->getAttribute('ea_field')) {