diff --git a/imp.push.xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate b/imp.push.xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate
index 75b5c1f..608da50 100644
Binary files a/imp.push.xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate and b/imp.push.xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..edd3249
--- /dev/null
+++ b/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "src/imp.push.c"
+            timestampString = "485823572.62567"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "294"
+            endingLineNumber = "294"
+            landmarkName = "imp_push_threadproc()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcschemes/max-external.xcscheme b/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcschemes/max-external.xcscheme
index c26661c..2ba6646 100644
--- a/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcschemes/max-external.xcscheme
+++ b/imp.push.xcodeproj/xcuserdata/David.xcuserdatad/xcschemes/max-external.xcscheme
@@ -42,6 +42,11 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <PathRunnable
+         runnableDebuggingMode = "0"
+         BundleIdentifier = "com.cycling74.Max"
+         FilePath = "/Applications/Max.app">
+      </PathRunnable>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
diff --git a/src/imp.push.c b/src/imp.push.c
index bfa8f07..96d8da4 100644
--- a/src/imp.push.c
+++ b/src/imp.push.c
@@ -123,8 +123,8 @@ t_imp_push* imp_push_new()
 
 		systhread_mutex_new(&x->mutex, 0);
 
-		x->draw_buffer = sysmem_newptrclear(PUSH2_DISPLAY_IMAGE_BUFFER_SIZE);
-		x->send_buffer = sysmem_newptrclear(PUSH2_DISPLAY_IMAGE_BUFFER_SIZE);
+		x->draw_buffer = (t_uint8*)sysmem_newptrclear(PUSH2_DISPLAY_IMAGE_BUFFER_SIZE);
+		x->send_buffer = (t_uint8*)sysmem_newptrclear(PUSH2_DISPLAY_IMAGE_BUFFER_SIZE);
 		imp_push_copyandmask_buffer(x);
 
 		imp_push_open_device(x);
@@ -184,9 +184,9 @@ t_jit_err imp_push_matrix_calc(t_imp_push* x, void* inputs, void* outputs)
 		return JIT_ERR_INVALID_INPUT;
 	}
 	
-	uint8_t* src = input_data;
+	t_uint8* src = (t_uint8*)input_data;
 
-	uint16_t* dst = (uint16_t*)x->draw_buffer;
+	t_uint16* dst = (t_uint16*)x->draw_buffer;
 
 	if (input_info.planecount == 3)
 	{
@@ -252,8 +252,6 @@ void* imp_push_threadproc(t_imp_push* x)
 	{
 		if (x->device != NULL)
 		{
-			systhread_mutex_lock(x->mutex);
-
 			int actual_length;
 
 			result = libusb_bulk_transfer(
@@ -267,6 +265,9 @@ void* imp_push_threadproc(t_imp_push* x)
 			if (result != 0)
 				break;
 
+            
+            systhread_mutex_lock(x->mutex);
+            
 			for (int i = 0; i < PUSH2_DISPLAY_MESSAGES_PER_IMAGE; ++i)
 			{
 				result = libusb_bulk_transfer(