diff --git a/src/GCSDesktop/Forms/FrmMachine.Designer.cs b/src/GCSDesktop/Forms/FrmMachine.Designer.cs
index 7d3f202..d6640a5 100644
--- a/src/GCSDesktop/Forms/FrmMachine.Designer.cs
+++ b/src/GCSDesktop/Forms/FrmMachine.Designer.cs
@@ -329,9 +329,6 @@ private void InitializeComponent()
             jogControl.Size = new System.Drawing.Size(439, 190);
             jogControl.StepValue = 0;
             jogControl.TabIndex = 5;
-            jogControl.OnJogStart += jogControl_OnJogStart;
-            jogControl.OnJogStop += jogControl_OnJogStop;
-            jogControl.OnUpdate += jogControl_OnUpdate;
             // 
             // toolStripMain
             // 
diff --git a/src/GCSDesktop/Forms/FrmMachine.cs b/src/GCSDesktop/Forms/FrmMachine.cs
index f979149..e3b1c82 100644
--- a/src/GCSDesktop/Forms/FrmMachine.cs
+++ b/src/GCSDesktop/Forms/FrmMachine.cs
@@ -1680,6 +1680,10 @@ private void HookUpEvents()
             selectionOverrideSpindle.EnabledChanged += SelectionOverride_ValueChanged;
             cbOverridesDisable.CheckedChanged += SelectionOverride_ValueChanged;
 
+            jogControl.OnJogStart += jogControl_OnJogStart;
+            jogControl.OnJogStop += jogControl_OnJogStop;
+            jogControl.OnUpdate += jogControl_OnUpdate;
+
             trackBarPercent.ValueChanged += SelectionOverride_ValueChanged;
 
             btnGrblCommandClear.Click += btnGrblCommandClear_Click;
diff --git a/src/GSendControls/Controls/BaseControl.cs b/src/GSendControls/Controls/BaseControl.cs
index 493cac5..97229c3 100644
--- a/src/GSendControls/Controls/BaseControl.cs
+++ b/src/GSendControls/Controls/BaseControl.cs
@@ -105,7 +105,7 @@ protected override void OnLoad(EventArgs e)
         /// <param name="Title">Title of dialog box</param>
         /// <param name="Message">Message to be displayed</param>
         /// <returns>true if user clicks yes, otherwise false</returns>
-        protected bool ShowHardConfirm(string Title, string Message)
+        protected static bool ShowHardConfirm(string Title, string Message)
         {
             return MessageBox.Show(Message, Title, MessageBoxButtons.YesNo, MessageBoxIcon.Stop) == DialogResult.Yes;
         }
@@ -116,7 +116,7 @@ protected bool ShowHardConfirm(string Title, string Message)
         /// <param name="Title">Title of dialog box</param>
         /// <param name="Message">Message to be displayed</param>
         /// <returns>true if user clicks yes, otherwise false</returns>
-        protected bool ShowQuestion(string Title, string Message)
+        protected static bool ShowQuestion(string Title, string Message)
         {
             return MessageBox.Show(Message, Title, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes;
         }
@@ -126,7 +126,7 @@ protected bool ShowQuestion(string Title, string Message)
         /// </summary>
         /// <param name="Title">Title of dialog box</param>
         /// <param name="Message">Message to be displayed</param>
-        protected void ShowInformation(string Title, string Message)
+        protected static void ShowInformation(string Title, string Message)
         {
             MessageBox.Show(Message, Title, MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
@@ -136,7 +136,7 @@ protected void ShowInformation(string Title, string Message)
         /// </summary>
         /// <param name="Title">Title of dialog box</param>
         /// <param name="Message">Message to be displayed</param>
-        protected void ShowError(string Title, string Message)
+        protected static void ShowError(string Title, string Message)
         {
             MessageBox.Show(Message, Title, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }