diff --git a/src/pao_model.F b/src/pao_model.F
index e05443b91b..898f1763b8 100644
--- a/src/pao_model.F
+++ b/src/pao_model.F
@@ -10,7 +10,9 @@
 !> \author Ole Schuett
 ! **************************************************************************************************
 MODULE pao_model
-   USE OMP_LIB,                         ONLY: omp_init_lock
+   USE OMP_LIB,                         ONLY: omp_init_lock,&
+                                              omp_set_lock,&
+                                              omp_unset_lock
    USE atomic_kind_types,               ONLY: atomic_kind_type,&
                                               get_atomic_kind
    USE basis_set_types,                 ONLY: gto_basis_set_type
diff --git a/tools/conventions/conventions.supp b/tools/conventions/conventions.supp
index d7fb7de889..bbe47b264d 100644
--- a/tools/conventions/conventions.supp
+++ b/tools/conventions/conventions.supp
@@ -113,14 +113,7 @@ message_passing.F: Found CALL m_abort in procedure "mp_abort" https://cp2k.org/c
 message_passing.F: Found CLOSE statement in procedure "mp_file_close" https://cp2k.org/conv#c204
 message_passing.F: Found OPEN statement in procedure "mp_file_open" https://cp2k.org/conv#c203
 message_passing.F: Found STOP statement in procedure "mp_abort" https://cp2k.org/conv#c205
-message_passing.F: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
-message_passing.F: Type mismatch between actual argument at (1) and actual argument at (2) (REAL(4)/INTEGER(4)).
 message_passing.F: USE statement at (1) has no ONLY qualifier [-Wuse-without-only]
-message_passing.fypp: Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar)
-message_passing.fypp: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1)
-message_passing.fypp: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-3)
-message_passing.fypp: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-4)
-message_passing.fypp: Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/COMPLEX(4)).
 mltfftsg_tools.F: Found WRITE statement with hardcoded unit in "ctrig" https://cp2k.org/conv#c012
 mode_selective.F: Found READ with unchecked STAT in "bfgs_guess" https://cp2k.org/conv#c001
 negf_methods.F: Found CALL with NULL() as argument in procedure "converge_density" https://cp2k.org/conv#c007
@@ -159,7 +152,6 @@ qs_linres_current.F: Found WRITE statement with hardcoded unit in "box_atoms_new
 qs_linres_current.F: Found WRITE statement with hardcoded unit in "calculate_jrho_resp" https://cp2k.org/conv#c012
 qs_linres_current.F: Found WRITE statement with hardcoded unit in "collocate_gauge_new" https://cp2k.org/conv#c012
 qs_linres_issc_utils.F: Found WRITE statement with hardcoded unit in "issc_issc" https://cp2k.org/conv#c012
-qs_ot.F: Found WRITE statement with hardcoded unit in "qs_ot_generate_rotation" https://cp2k.org/conv#c012
 qs_rho_atom_methods.F: Found WRITE statement with hardcoded unit in "init_rho_atom" https://cp2k.org/conv#c012
 se_core_matrix.F: Found WRITE statement with hardcoded unit in "aa" https://cp2k.org/conv#c012
 se_core_matrix.F: Found WRITE statement with hardcoded unit in "makeds" https://cp2k.org/conv#c012