diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 296513a21..5fdb87011 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.6.2072.0")]
-[assembly: AssemblyFileVersion("3.6.2072.0")]
+[assembly: AssemblyVersion("3.6.2086.0")]
+[assembly: AssemblyFileVersion("3.6.2086.0")]
diff --git a/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs b/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
index 7ce0275fd..606c9339a 100644
--- a/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
+++ b/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
@@ -317,6 +317,9 @@ namespace TBF.Rig.DataEntry.Uni
                     checkBoxes[wmPos0] = checkBox;
                     this.Controls.Add(checkBox);
                 }
+
+                okButton.TabIndex = tabIndex++;
+                clearButton.TabIndex = tabIndex++;
             }
 
             ///
diff --git a/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs b/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
index cab317ada..311ebfb58 100644
--- a/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
@@ -670,6 +670,8 @@ namespace TBF.Rig.DataEntry.Uni
 
         public void OnOcrTextObtained(int ix, bool _isEnd, string text)
         {
+            if (!isCameraPicture) return;
+
             if (_isEnd)
             {
                 if (endStateColumn>= 0 && textBoxes[endStateColumn, ix].Enabled)
@@ -774,7 +776,7 @@ namespace TBF.Rig.DataEntry.Uni
                     largeTextBox.Text = string.Format("{0}:   {1}", j + 1, textBoxes[k, j].Text);
                     largeExclamationLabel.Visible = false;
 
-                    if (k == startStateColumn || k == endStateColumn)
+                    if (isCameraPicture && (k == startStateColumn || k == endStateColumn))
                     {
                         LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j);
                     }
@@ -832,15 +834,16 @@ namespace TBF.Rig.DataEntry.Uni
 
         private void textBox_AcceptsTabChanged(object sender, EventArgs e)
         {
-            if (!isHandlersEnabled) return;
+            if (!isHandlersEnabled || !isCameraPicture) return;
 
             string[] kj = (sender as TextBox).Name.Split(new char[] { '~' });
             int k = int.Parse(kj[0]);
             int j = int.Parse(kj[1]);
 
-            if (k != startStateColumn && k != endStateColumn) return;
-
-            LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j);
+            if (k == startStateColumn || k == endStateColumn)
+            {
+                LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j);
+            }
         }
 
 
@@ -1030,6 +1033,8 @@ namespace TBF.Rig.DataEntry.Uni
         /// </summary>
         void ShowImage()
         {
+            if (pictureBox1 == null) return;
+
             if (lastImage == null)
             {
                 pictureBox1.Image = new Bitmap(TBF.Properties.Resources.Empty);