diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs
index a9f20c81a..a522d4cd2 100644
--- a/TestBenchFramework/MainWnd.cs
+++ b/TestBenchFramework/MainWnd.cs
@@ -154,11 +154,13 @@ namespace TBF
                 try
                 {
                     string message = BenchControl.StateMachine.InitializeDevices();
+#if !MUNICH
 					if (message != null)
 					{
 						MessageBox.Show("The following components are in simulation mode: \r\n" + message,
 										"Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
 					}
+#endif
 
                     //emergencyStopModelessDlg = new TBF.Forms.EmergencyStopForm();
                     //emergencyStopModelessDlg.Show();
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
index 3bc4e7d54..83c845ccc 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
@@ -77,14 +77,12 @@ namespace TBF.Screens
             // 
             // previousResultsButton
             // 
-            this.previousResultsButton.Enabled = false;
             this.previousResultsButton.Location = new System.Drawing.Point(252, 10);
             this.previousResultsButton.Name = "previousResultsButton";
             this.previousResultsButton.Size = new System.Drawing.Size(100, 30);
             this.previousResultsButton.TabIndex = 2;
             this.previousResultsButton.Text = "Previous results";
             this.previousResultsButton.UseVisualStyleBackColor = true;
-            this.previousResultsButton.Visible = false;
             this.previousResultsButton.Click += new System.EventHandler(this.previousResultsButton_Click);
             // 
             // configureButton
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
index 705a1f778..70ca397b5 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
@@ -45,6 +45,10 @@ namespace TBF.Screens
         {
             InitializeComponent();
 
+#if MUNICH
+            previousResultsButton.Visible = false;
+#endif
+
 			Bridge.ProcedureSelectedHandler += delegate(object sender, ProcedureSelectedEventArgs args)
 			{
                 if (InvokeRequired)