diff --git a/harbour/doc/funclist.txt b/harbour/doc/funclist.txt
index 2db3efdc1b..df531e9447 100644
--- a/harbour/doc/funclist.txt
+++ b/harbour/doc/funclist.txt
@@ -42,7 +42,7 @@ AINS                    ;R;
 ALERT                   ;R;
 ALIAS                   ;R;
 ALLTRIM                 ;R;
-ALTD                    ;N;
+ALTD                    ;S;
 ARRAY                   ;R;
 ASC                     ;R;
 ASCAN                   ;R;
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index ad78a9f6ab..289a8f0443 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -33,10 +33,6 @@
  *
  */
 
-/* NOTE: Don't use SAY/DevOut()/DevPos() for screen output, otherwise
-         the debugger output may interfere with the applications output
-         redirection, and is also slower. [vszel] */
-
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 #include "box.ch"
@@ -56,12 +52,13 @@ static s_oDebugger
 static s_lExit := .F.
 static s_lEnabled := .t.
 
-function _AltD( nAction ) // it should be AltD(), but Harbour refuses to compile it
+function AltD( nAction )
 
    do case
       case nAction == nil
            if s_lEnabled
-              ___dbgEntry( ProcLine( 2 ) )
+              s_lExit = .f.
+              __dbgEntry( ProcLine( 2 ) )
            endif
 
       case nAction == ALTD_DISABLE
@@ -1515,12 +1512,6 @@ function BuildMenu( oDebugger )  // Builds the debugger pulldown menu
 
 return oMenu
 
-function AltD()
-
-   s_lExit := .F.
-
-return nil
-
 static function ValToStr( uVal )
 
    local cType := ValType( uVal )
@@ -1550,4 +1541,3 @@ static function ValToStr( uVal )
    endcase
 
 return cResult
-
diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg
index 7d69c93bf4..7033b62318 100644
--- a/harbour/source/rtl/tgetlist.prg
+++ b/harbour/source/rtl/tgetlist.prg
@@ -112,7 +112,7 @@ CLASS TGetList
    METHOD ReadVar( cNewVarName )
    METHOD ReadExit( lNew ) INLINE Set( _SET_EXIT, lNew )
 
-   METHOD SetFocus() INLINE oGetListActive := ::oGetList,;
+   METHOD SetFocus() INLINE oGetListActive := Self,;
                             ::aGetList[ ::nPos ]:SetFocus()
 
    METHOD Updated() INLINE ::lUpdated