diff --git a/.gitignore b/.gitignore
index f570ed72c..d0da2d2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 package-lock.json
 zabapgit.abap
 .vscode
+deps
diff --git a/abaplint.json b/abaplint.json
index 809af538f..89356506e 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -6,7 +6,13 @@
     "skipGeneratedFunctionGroups": true,
     "applyUnspecifiedRules": false
   },
-  "dependencies": [],
+  "dependencies": [
+    {
+      "url": "https://github.com/abaplint/deps",
+      "folder": "/deps",
+      "files": "/src/**/*.*"
+    }
+  ],
   "syntax": {
     "errorNamespace": "^(Z|Y)",
     "globalConstants": [
@@ -23,6 +29,7 @@
       "seoc_version_inactive",
       "seok_access_free",
       "seok_access_modify",
+      "seok_pgmid_r3tr",
       "seop_ext_class_locals_def",
       "seop_ext_class_locals_imp",
       "seop_ext_class_macros",
@@ -52,6 +59,10 @@
       "enabled": true,
       "exclude": []
     },
+    "ambiguous_statement": {
+      "enabled": true,
+      "exclude": []
+    },
     "avoid_use": {
       "enabled": true,
       "exclude": [],
@@ -67,8 +78,8 @@
       "exclude": []
     },
     "check_variables": {
-      "enabled": false,
-      "exclude": ["zcl_abapgit_ecatt"]
+      "enabled": true,
+      "exclude": []
     },
     "class_attribute_names": {
       "enabled": true,
@@ -330,8 +341,8 @@
       "exclude": []
     },
     "superclass_final": {
-      "enabled": false,
-      "exclude": ["zcl_abapgit_ecatt"]
+      "enabled": true,
+      "exclude": []
     },
     "tabl_enhancement_category": {
       "enabled": true,
diff --git a/package.json b/package.json
index 8ff3b5159..0123fb7b9 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/larshp/abapGit.git"
   },
   "devDependencies": {
-    "abaplint": "^1.7.13",
+    "abaplint": "^1.7.21",
     "abapmerge": "^0.11.5",
     "eslint": "^5.11.1"
   }
diff --git a/src/objects/zcl_abapgit_object_tobj.clas.abap b/src/objects/zcl_abapgit_object_tobj.clas.abap
index 46bb735b4..008ab93f6 100644
--- a/src/objects/zcl_abapgit_object_tobj.clas.abap
+++ b/src/objects/zcl_abapgit_object_tobj.clas.abap
@@ -63,7 +63,9 @@ CLASS ZCL_ABAPGIT_OBJECT_TOBJ IMPLEMENTATION.
                                         event   = <ls_tvimf>-event
                                TRANSPORTING NO FIELDS.
       IF sy-subrc <> 0.
-        DELETE tvimf FROM <ls_tvimf>.
+        DELETE FROM tvimf
+          WHERE tabname = <ls_tvimf>-tabname
+          AND event = <ls_tvimf>-event.
       ENDIF.
     ENDLOOP.
 
diff --git a/src/zabapgit.prog.abap b/src/zabapgit.prog.abap
index 7c8a33018..ebdad77c0 100644
--- a/src/zabapgit.prog.abap
+++ b/src/zabapgit.prog.abap
@@ -30,6 +30,8 @@ SELECTION-SCREEN BEGIN OF SCREEN 1001.
 * dummy for triggering screen on Java SAP GUI
 SELECTION-SCREEN END OF SCREEN 1001.
 
+TABLES sscrfields.
+
 INCLUDE zabapgit_password_dialog. " !!! Contains SELECTION SCREEN
 
 * create class ZCL_ABAPGIT_AUTH_EXIT implementing ZIF_ABAPGIT_AUTH in following include,
diff --git a/src/zabapgit_password_dialog.prog.abap b/src/zabapgit_password_dialog.prog.abap
index c6b1a8487..f7f52c651 100644
--- a/src/zabapgit_password_dialog.prog.abap
+++ b/src/zabapgit_password_dialog.prog.abap
@@ -1,12 +1,11 @@
 *&---------------------------------------------------------------------*
 *&  Include           ZABAPGIT_PASSWORD_DIALOG
 *&---------------------------------------------------------------------*
-TABLES sscrfields.
 
 SELECTION-SCREEN BEGIN OF SCREEN 1002 TITLE s_title.
 SELECTION-SCREEN BEGIN OF LINE.
 SELECTION-SCREEN COMMENT 1(10) s_url FOR FIELD p_url.
-PARAMETERS: p_url  TYPE string LOWER CASE VISIBLE LENGTH 40 ##SEL_WRONG.
+PARAMETERS: p_url TYPE string LOWER CASE VISIBLE LENGTH 40 ##SEL_WRONG.
 SELECTION-SCREEN END OF LINE.
 SELECTION-SCREEN BEGIN OF LINE.
 SELECTION-SCREEN COMMENT 1(10) s_user FOR FIELD p_user.