Index: mysql-gui-common/source/linux/canvas/MGCanvas.cc
===================================================================
--- mysql-gui-common/source/linux/canvas/MGCanvas.cc	(revision 1235)
+++ mysql-gui-common/source/linux/canvas/MGCanvas.cc	(working copy)
@@ -555,9 +555,9 @@
 void MGCanvas::toggle_overview()
 {
   if (_canvas->currentViewGet()->overviewActive())
-    _canvas->currentViewGet()->overviewStop(true);
+    _canvas->currentViewGet()->overviewStop(true, false); // test w/(true, true)
   else
-    _canvas->currentViewGet()->overviewStart();
+    _canvas->currentViewGet()->overviewStart(false); // test w/(true)
   
   // reflectContentRect();
 }
Index: mysql-gui-common/source/grtsh/grtsh.cc
===================================================================
--- mysql-gui-common/source/grtsh/grtsh.cc	(revision 1235)
+++ mysql-gui-common/source/grtsh/grtsh.cc	(working copy)
@@ -25,7 +25,9 @@
 #endif
 
 #include <myx_grt_public_interface.h>
+#ifdef ENABLE_JAVA_MODULES
 #include <myx_grt_java.h>
+#endif
 #include <myx_sql_resultset.h>
 
 #include <myx_grt_builtin_module_public_interface.h>
Index: mysql-gui-common/library_gc/source/myx_gc_animation.cpp
===================================================================
--- mysql-gui-common/library_gc/source/myx_gc_animation.cpp	(revision 1235)
+++ mysql-gui-common/library_gc/source/myx_gc_animation.cpp	(working copy)
@@ -460,7 +460,7 @@
     if (iterator->first != animation)
       break;
 
-    iterator = FDependencies.erase(iterator);
+  /*iterator =*/ FDependencies.erase(iterator);
   };
 
   // Then remove all entries that trigger the given animation.
@@ -468,7 +468,7 @@
   while (iterator != FDependencies.end())
   {
     if (iterator->second == animation)
-      iterator = FDependencies.erase(iterator);
+    /*iterator =*/ FDependencies.erase(iterator);
     else
       ++iterator;
   };
@@ -518,7 +518,7 @@
       break;
 
     iterator->second->suspendedSet(false);
-    iterator = FDependencies.erase(iterator);
+  /*iterator =*/ FDependencies.erase(iterator);
   };
 }