diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index 442cfe8..1bc2bd5 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -177,8 +177,7 @@ class EbicsFile(models.Model):
         if res_action.get("type") and res_action["type"] == "ir.actions.client":
             st_line_ids = res_action["context"].get("statement_line_ids", [])
             if st_line_ids:
-                ##TODO:  Use flush_model(), flush_recordset() or env.flush_all() ###########################
-                self.flush()
+                self.env.flush_all()
                 self.env.cr.execute(
                     """
                 SELECT DISTINCT
diff --git a/account_ebics/views/ebics_userid_views.xml b/account_ebics/views/ebics_userid_views.xml
index a2a572c..f3dc07e 100644
--- a/account_ebics/views/ebics_userid_views.xml
+++ b/account_ebics/views/ebics_userid_views.xml
@@ -120,10 +120,10 @@
                     name="dn"
                     attrs="{'invisible': [('ebics_key_x509', '=', False)], 'readonly': [('state', '!=', 'draft')]}"
                 >
-          <group colspan="4" col="1">
+          <div colspan="4" col="1">
             <strong
                         >Distinguished Name attributes used to create self-signed X.509 certificates:</strong>
-          </group>
+          </div>
           <group name="dn_l" colspan="2">
             <field name="ebics_key_x509_dn_cn" />
             <field name="ebics_key_x509_dn_o" />