diff --git a/src/zabapgit_gui.prog.abap b/src/zabapgit_gui.prog.abap
index 57aa70416..1bfa828e0 100644
--- a/src/zabapgit_gui.prog.abap
+++ b/src/zabapgit_gui.prog.abap
@@ -14,7 +14,7 @@ CLASS lcl_gui DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
 
     METHODS back
       IMPORTING iv_to_bookmark TYPE abap_bool DEFAULT abap_false
-      RETURNING value(rv_exit) TYPE xfeld
+      RETURNING VALUE(rv_exit) TYPE xfeld
       RAISING   lcx_exception.
 
     METHODS on_event FOR EVENT sapevent OF cl_gui_html_viewer
@@ -45,13 +45,13 @@ CLASS lcl_gui DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
 
     METHODS cache_html
       IMPORTING iv_html       TYPE string
-      RETURNING value(rv_url) TYPE w3url.
+      RETURNING VALUE(rv_url) TYPE w3url.
 
     METHODS render
       RAISING lcx_exception.
 
     METHODS get_current_page_name
-      RETURNING value(rv_page_name) TYPE string.
+      RETURNING VALUE(rv_page_name) TYPE string.
 
     METHODS call_page
       IMPORTING ii_page          TYPE REF TO lif_gui_page
diff --git a/src/zabapgit_page_main.prog.abap b/src/zabapgit_page_main.prog.abap
index b6045c066..d8e79b447 100644
--- a/src/zabapgit_page_main.prog.abap
+++ b/src/zabapgit_page_main.prog.abap
@@ -91,9 +91,9 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
   METHOD lif_gui_page~render.
 
-    DATA: lt_repos   TYPE lcl_repo_srv=>ty_repo_tt,
-          lx_error   TYPE REF TO lcx_exception,
-          lo_repo    LIKE LINE OF lt_repos.
+    DATA: lt_repos TYPE lcl_repo_srv=>ty_repo_tt,
+          lx_error TYPE REF TO lcx_exception,
+          lo_repo  LIKE LINE OF lt_repos.
 
     retrieve_active_repo( ). " Get and validate key of user default repo
 
@@ -139,7 +139,7 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
       TRY. " verify the key exists
           lo_repo = lcl_app=>repo_srv( )->get( mv_show ).
         CATCH lcx_exception.
-          clear mv_show.
+          CLEAR mv_show.
       ENDTRY.
     ENDIF.