diff --git a/abaplint.json b/abaplint.json
index 70dbfbb5f..143f76b94 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -70,7 +70,7 @@
   "rules": {
     "unknown_types": true,
     "forbidden_void_type": {
-      "check": ["^stringtab$", "^SYCHAR01$", "^char2$", "^char20$", "^int4$", "^flag$"]
+      "check": ["^stringtab$", "^SYCHAR01$", "^char2$", "^char20$", "^int4$", "^flag$", "^char12$", "^char10$", "^char70$", "^char4$"]
     },
     "forbidden_identifier": true,
     "try_without_catch": false,
diff --git a/src/persist/zcl_abapgit_persist_migrate.clas.abap b/src/persist/zcl_abapgit_persist_migrate.clas.abap
index ba65613d0..dd69092b2 100644
--- a/src/persist/zcl_abapgit_persist_migrate.clas.abap
+++ b/src/persist/zcl_abapgit_persist_migrate.clas.abap
@@ -3,6 +3,7 @@ CLASS zcl_abapgit_persist_migrate DEFINITION PUBLIC CREATE PUBLIC.
   PUBLIC SECTION.
     CLASS-METHODS: run RAISING zcx_abapgit_exception.
 
+  PROTECTED SECTION.
   PRIVATE SECTION.
     TYPES: BEGIN OF ty_settings_to_migrate,
              name  TYPE string,
@@ -64,13 +65,15 @@ CLASS ZCL_ABAPGIT_PERSIST_MIGRATE IMPLEMENTATION.
 
   METHOD distribute_settings_to_users.
 
-    DATA: lt_abapgit_users    TYPE STANDARD TABLE OF char12
+    TYPES: ty_char12 TYPE c LENGTH 12.
+
+    DATA: lt_abapgit_users    TYPE STANDARD TABLE OF ty_char12
                                    WITH NON-UNIQUE DEFAULT KEY,
           ls_user_settings    TYPE zif_abapgit_definitions=>ty_s_user_settings,
           li_user_persistence TYPE REF TO zif_abapgit_persist_user.
 
-    FIELD-SYMBOLS: <lv_user>                     LIKE LINE OF lt_abapgit_users,
-                   <ls_setting_to_migrate>       TYPE ty_settings_to_migrate,
+    FIELD-SYMBOLS: <lv_user>                      LIKE LINE OF lt_abapgit_users,
+                   <ls_setting_to_migrate>        TYPE ty_settings_to_migrate,
                    <lg_user_specific_setting_val> TYPE data.
 
     " distribute settings to all abapGit users
diff --git a/src/ui/zcl_abapgit_gui_page_boverview.clas.abap b/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
index 4506c2375..e5abf64c6 100644
--- a/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
@@ -304,7 +304,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_BOVERVIEW IMPLEMENTATION.
 
   METHOD render_commit_popups.
 
-    DATA: lv_time    TYPE char10,
+    DATA: lv_time    TYPE c LENGTH 10,
           lv_date    TYPE sy-datum,
           lv_content TYPE string.
 
diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap
index e0061600e..76a45e78d 100644
--- a/src/ui/zcl_abapgit_popups.clas.abap
+++ b/src/ui/zcl_abapgit_popups.clas.abap
@@ -100,7 +100,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_popups IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION.
 
 
   METHOD add_field.
@@ -716,6 +716,32 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_popups~popup_proxy_bypass.
+    rt_proxy_bypass = it_proxy_bypass.
+    CALL FUNCTION 'COMPLEX_SELECTIONS_DIALOG'
+      EXPORTING
+        title             = 'Bypass proxy settings for these Hosts & Domains'
+        signed            = abap_false
+        lower_case        = abap_true
+        no_interval_check = abap_true
+      TABLES
+        range             = rt_proxy_bypass
+      EXCEPTIONS
+        no_range_tab      = 1
+        cancelled         = 2
+        internal_error    = 3
+        invalid_fieldname = 4
+        OTHERS            = 5.
+    CASE sy-subrc.
+      WHEN 0.
+      WHEN 2.
+        RAISE EXCEPTION TYPE zcx_abapgit_cancel.
+      WHEN OTHERS.
+        zcx_abapgit_exception=>raise( 'Error from COMPLEX_SELECTIONS_DIALOG' ).
+    ENDCASE.
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_popups~popup_to_confirm.
 
     CALL FUNCTION 'POPUP_TO_CONFIRM'
@@ -818,8 +844,8 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
 
   METHOD zif_abapgit_popups~popup_to_inform.
 
-    DATA: lv_line1 TYPE char70,
-          lv_line2 TYPE char70.
+    DATA: lv_line1 TYPE c LENGTH 70,
+          lv_line2 TYPE c LENGTH 70.
 
     lv_line1 = iv_text_message.
     IF strlen( iv_text_message ) > 70.
@@ -1275,32 +1301,6 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD zif_abapgit_popups~popup_proxy_bypass.
-    rt_proxy_bypass = it_proxy_bypass.
-    CALL FUNCTION 'COMPLEX_SELECTIONS_DIALOG'
-      EXPORTING
-        title             = 'Bypass proxy settings for these Hosts & Domains'
-        signed            = abap_false
-        lower_case        = abap_true
-        no_interval_check = abap_true
-      TABLES
-        range             = rt_proxy_bypass
-      EXCEPTIONS
-        no_range_tab      = 1
-        cancelled         = 2
-        internal_error    = 3
-        invalid_fieldname = 4
-        OTHERS            = 5.
-    CASE sy-subrc.
-      WHEN 0.
-      WHEN 2.
-        RAISE EXCEPTION TYPE zcx_abapgit_cancel.
-      WHEN OTHERS.
-        zcx_abapgit_exception=>raise( 'Error from COMPLEX_SELECTIONS_DIALOG' ).
-    ENDCASE.
-  ENDMETHOD.
-
-
   METHOD _popup_3_get_values.
 
     DATA lv_answer TYPE c LENGTH 1.
@@ -1343,5 +1343,4 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
     ENDIF.
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/zabapgit_password_dialog.prog.abap b/src/zabapgit_password_dialog.prog.abap
index f7f52c651..5cc54c6ae 100644
--- a/src/zabapgit_password_dialog.prog.abap
+++ b/src/zabapgit_password_dialog.prog.abap
@@ -27,7 +27,7 @@ CLASS lcl_password_dialog DEFINITION FINAL.
 **************
 
   PUBLIC SECTION.
-    CONSTANTS c_dynnr TYPE char4 VALUE '1002'.
+    CONSTANTS c_dynnr TYPE c LENGTH 4 VALUE '1002'.
 
     CLASS-METHODS popup
       IMPORTING