diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 46f94b66..81303a64 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 0fa88486..ac7b401b 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -170,9 +170,12 @@ namespace Step.Database.Controllers
                     .Where(x => ids.Contains(x.Id))
                     .ToList();
 
-                // Find max between families
-                shank.MaxRight = families.Max(x => x.RightSize);
-                shank.MaxLeft = families.Max(x => x.LeftSize);
+                if (families.Count() > 0)
+                {
+                    // Find max between families
+                    shank.MaxRight = families.Max(x => x.RightSize);
+                    shank.MaxLeft = families.Max(x => x.LeftSize);
+                }
             }
 
             return dtoShanks;
diff --git a/Step/Listeners/Database/SignalRDatabaseHandler.cs b/Step/Listeners/Database/SignalRDatabaseHandler.cs
index ab564cba..870a0b1b 100644
--- a/Step/Listeners/Database/SignalRDatabaseHandler.cs
+++ b/Step/Listeners/Database/SignalRDatabaseHandler.cs
@@ -84,16 +84,16 @@ namespace Step.Listeners.Database
                 case 3:
                     return (byte)(oldValue | (1 << 2));
                 case 9:
-                    return (byte)(oldValue | (0 << 0));
+                    return (byte)(oldValue & ~(1 << 0));
                 case 10:
-                    return (byte)(oldValue | (0 << 1));
+                    return (byte)(oldValue & ~(1 << 1));
                 case 11:
-                    return (byte)(oldValue | (0 << 2));
+                    return (byte)(oldValue & ~(1 << 2));
             }
 
             return 0;
         }
-
+        
         public static void UpdateQueue(object queue)
         {
             List<DTOQueueModel> newQueue = queue as List<DTOQueueModel>;