diff --git a/src/common/parser.y b/src/common/parser.y
index 1acd51cc13..591c10c551 100644
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -157,7 +157,7 @@ void yyerror(char *s)
  */
 
 /* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd */
-#ifdef __ALPHA__
+#if defined( __ALPHA__ ) && !defined( __VMS__ )
 #ifndef yywrap
 #define yywrap() 1
 #endif
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 3e3404ed20..7e87947585 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3723,8 +3723,11 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             }
             return TRUE;
         }
-        result = TRUE;
+#if 0
+// There is no path to this code !!!!!!
+       result = TRUE;
         break;
+#endif
     }
 
     if (result && !GetBatchCount() )