diff --git a/mac-cpp-source/tip/tip_aspi.cpp b/mac-cpp-source/tip/tip_aspi.cpp
index 9fbf58a..042ffe0 100644
--- a/mac-cpp-source/tip/tip_aspi.cpp
+++ b/mac-cpp-source/tip/tip_aspi.cpp
@@ -514,11 +514,22 @@ void SetCartridgeStatusToEAX(long eax) {
     long PriorStatus = CartridgeStatus;
     CartridgeStatus = eax;
 
+    /**************************************************************************
+     * Added by MLT
+     */
+    // Avoid flickering
+    static long LastCartridgeStatus = -1;
+    if (LastCartridgeStatus == CartridgeStatus) {
+        return;
+    }
+    LastCartridgeStatus = CartridgeStatus;
+     // Disable testing button when no drives present
     if (!DriveCount) {
         // MLT: Added this check.
         SetRichEditText(szASPITrouble);
         goto DisableActions;
     }
+    /**************************************************************************/
 
     // Set the text of the "action initiate button"
     const char *esi = 0;
diff --git a/mac-cpp-source/tip/tip_main.cpp b/mac-cpp-source/tip/tip_main.cpp
index 8d280a7..9e2a30a 100644
--- a/mac-cpp-source/tip/tip_main.cpp
+++ b/mac-cpp-source/tip/tip_main.cpp
@@ -512,4 +512,5 @@ void ProcessPendingMessages() {
     if (GetNextEvent(everyEvent, &event)) {
         DoEvent(event,NULL);
     }
+    SystemTask();
 }