diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9d5ba8eaf0..af8a4e1321 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+20000117-12:25 GMT+1 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/rtl/achoice.prg
+    *source/rtl/input.prg
+	* macro related code are active now
+	
+    *source/compiler/harbour.y
+	* function that initializes static variables is generated
+	properly when ANNOUNCE statement is used
+
+
 20000116-20:30 GMT+1 Ryszard Glab <rglab@imid.med.pl>
 
     *source/rtl/harbinit.prg
diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y
index cdcdfd48c8..a56240d90e 100644
--- a/harbour/source/compiler/harbour.y
+++ b/harbour/source/compiler/harbour.y
@@ -1446,6 +1446,7 @@ int hb_compYACCMain( char * szName )
       pSym = hb_compSymbolAdd( hb_comp_pInitFunc->szName, NULL );
       pSym->cScope |= hb_comp_pInitFunc->cScope;
       hb_comp_functions.pLast->pNext = hb_comp_pInitFunc;
+      hb_comp_functions.pLast = hb_comp_pInitFunc;
       ++hb_comp_functions.iCount;
    }
 
diff --git a/harbour/source/rtl/achoice.prg b/harbour/source/rtl/achoice.prg
index 49fab1e4aa..1e365ffc22 100644
--- a/harbour/source/rtl/achoice.prg
+++ b/harbour/source/rtl/achoice.prg
@@ -149,9 +149,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
                   lFinished := .T.
                   nPos      := 0
                ELSE
-/* TODO: When macro evaluation will work, this should be commented out:
-               alSelect[ nCntr ] := &( xSelect[ nCntr ] )
-*/
+                   alSelect[ nCntr ] := &( xSelect[ nCntr ] )
                ENDIF
             ELSE
                alSelect[ nCntr ] := xSelect[ nCntr ]
diff --git a/harbour/source/rtl/input.prg b/harbour/source/rtl/input.prg
index 080ac8a084..d843735a10 100644
--- a/harbour/source/rtl/input.prg
+++ b/harbour/source/rtl/input.prg
@@ -67,6 +67,4 @@
 FUNCTION __Input( cMessage )
    LOCAL cString := __Accept( cMessage )
 
-// TOFIX: Uncomment this when macros are implemented
-// RETURN iif( Empty( cString ), NIL, &cString )
-   RETURN ""
+   RETURN iif( Empty( cString ), NIL, &cString )