diff --git a/KompleteSynthesia.xcodeproj/xcuserdata/till.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/KompleteSynthesia.xcodeproj/xcuserdata/till.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 9e5e538..5f2eadc 100644
--- a/KompleteSynthesia.xcodeproj/xcuserdata/till.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/KompleteSynthesia.xcodeproj/xcuserdata/till.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -4,38 +4,6 @@
    type = "1"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7B6D27F3-A364-4022-A126-8772DD0743E1"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KompleteSynthesia/USBController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "255"
-            endingLineNumber = "255"
-            landmarkName = "-bulkWriteData:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E07BADFC-B987-42D3-ADB1-C6DE62C7ED25"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KompleteSynthesia/USBController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
-            landmarkName = "-bulkWriteData:error:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
diff --git a/KompleteSynthesia/HIDController.m b/KompleteSynthesia/HIDController.m
index 4ce23f8..d66ef53 100644
--- a/KompleteSynthesia/HIDController.m
+++ b/KompleteSynthesia/HIDController.m
@@ -268,7 +268,7 @@ + (int)vendorIDWithDevice:(IOHIDDeviceRef)device
 // TODO: Make this MK1 compatible
 - (unsigned char)keyColor:(int)note
 {
-    assert(_mk == 2);
+    assert(_mk != 1);
     assert(note < kKompleteKontrolLightGuideKeyMapSize);
     return _keys[note];
 }
@@ -413,7 +413,7 @@ - (IOHIDDeviceRef)detectKeyboardController:(NSError**)error
     
 #ifdef DEBUG_FAKE_CONTROLLER
     _keyCount = 88;
-    _mk2Controller = YES;
+    _mk = 2;
     _keyOffset = -21;
     lightGuideUpdateMessage[0] = kCommandLightGuideUpdateMK2;
     // FIXME: This is likely wrong for MK1 devices!
@@ -445,7 +445,10 @@ - (IOHIDDeviceRef)detectKeyboardController:(NSError**)error
             lightGuideUpdateMessage[0] = _mk == 2 ? kCommandLightGuideUpdateMK2 : kCommandLightGuideUpdateMK1;
             // FIXME: This is likely wrong for MK1 devices!
             buttonLightingUpdateMessage[0] = kCommandButtonLightsUpdate;
-            _deviceName = [NSString stringWithFormat:@"Komplete Kontrol S%d MK%d", _keyCount, _mk];
+            _deviceName = [NSString stringWithFormat:@"%@Kontrol S%d MK%d",
+                           _mk != 3 ? @"Komplete " : @"",
+                           _keyCount,
+                           _mk];
             return devices[i];
         }
     }
@@ -555,7 +558,7 @@ - (BOOL)updateLightGuideMap:(NSError**)error
 
 - (void)lightKey:(int)key color:(unsigned char)color
 {
-    if (_mk == 2) {
+    if (_mk != 1) {
         _keys[key] = color;
     } else {
         setMk1ColorWithMk2ColorCode(color, &_keys[key*3]);
@@ -568,7 +571,7 @@ - (void)lightKeysWithColor:(unsigned char)color
     if (_keys == NULL) {
         return;
     }
-    if (_mk == 2) {
+    if (_mk != 1) {
         memset(_keys, color, kKompleteKontrolLightGuideKeyMapSize);
     } else {
         for (unsigned int i = 0; i < kKompleteKontrolLightGuideKeyMapSize; i += 3) {