diff --git a/Boxer.xcodeproj/project.pbxproj b/Boxer.xcodeproj/project.pbxproj
index ca38386a..09d7a50a 100644
--- a/Boxer.xcodeproj/project.pbxproj
+++ b/Boxer.xcodeproj/project.pbxproj
@@ -3468,7 +3468,7 @@
 			);
 			path = ADBToolkit;
 			sourceTree = "<group>";
-			usesTabs = 0;
+			usesTabs = 1;
 		};
 		9F81CFB613EEA3D7008F0265 /* Disk Images */ = {
 			isa = PBXGroup;
diff --git a/Boxer/BXEmulatorErrors.mm b/Boxer/BXEmulatorErrors.mm
index 6267bb89..946c5919 100644
--- a/Boxer/BXEmulatorErrors.mm
+++ b/Boxer/BXEmulatorErrors.mm
@@ -9,7 +9,6 @@
 #import "BXEmulatorPrivate.h"
 #import "BXEmulator+BXDOSFileSystem.h"
 #import "BXDrive.h"
-#import "RegexKitLite.h"
 
 #pragma mark -
 #pragma mark Private constants
diff --git a/Boxer/NSWorkspace+BXExecutableTypes.m b/Boxer/NSWorkspace+BXExecutableTypes.m
index 5bca6707..dba198af 100644
--- a/Boxer/NSWorkspace+BXExecutableTypes.m
+++ b/Boxer/NSWorkspace+BXExecutableTypes.m
@@ -26,7 +26,6 @@
 
 
 #import "NSWorkspace+BXExecutableTypes.h"
-#import "RegexKitLite.h"
 
 
 #pragma mark -
diff --git a/Other Sources/ADBToolkit/ADBHIDEvent.m b/Other Sources/ADBToolkit/ADBHIDEvent.m
index 4790e39c..c58caca0 100644
--- a/Other Sources/ADBToolkit/ADBHIDEvent.m	
+++ b/Other Sources/ADBToolkit/ADBHIDEvent.m	
@@ -257,8 +257,11 @@ - (void) dispatchHIDEvent: (ADBHIDEvent *)event
 {
 	SEL selector = [self.class delegateMethodForHIDEvent: event];
 	
-	if (selector && [self respondsToSelector: selector])
-		[self performSelector: selector withObject: event];
+	if (selector && [self respondsToSelector: selector]) {
+		IMP imp = [self methodForSelector:selector];
+		void (*func)(id, SEL, ADBHIDEvent*) = (void *)imp;
+		func(self, selector, event);
+	}
 }
 
 #pragma mark - DDHidMouseDelegate methods
diff --git a/Other Sources/ADBToolkit/ADBOperation.m b/Other Sources/ADBToolkit/ADBOperation.m
index 7a012f30..05a8384d 100644
--- a/Other Sources/ADBToolkit/ADBOperation.m	
+++ b/Other Sources/ADBToolkit/ADBOperation.m	
@@ -194,16 +194,20 @@ - (void) _postNotificationName: (NSString *)name
 	
 	if ([self.delegate respondsToSelector: selector])
 	{
-		if (self.notifiesOnMainThread)
+		if (self.notifiesOnMainThread) {
 			[(id)self.delegate performSelectorOnMainThread: selector withObject: notification waitUntilDone: NO];
-		else
-			[self.delegate performSelector: selector withObject: notification];
+		} else {
+			IMP imp = [(NSObject*)self.delegate methodForSelector: selector];
+			void (*func)(id, SEL, NSNotification*) = (void *)imp;
+			func(self.delegate, selector, notification);
+		}
 	}
 	
-	if (self.notifiesOnMainThread)
-		[center performSelectorOnMainThread: @selector(postNotification:) withObject: notification waitUntilDone: NO];		
-	else
+	if (self.notifiesOnMainThread) {
+		[center performSelectorOnMainThread: @selector(postNotification:) withObject: notification waitUntilDone: NO];
+	} else {
 		[center postNotification: notification];
+	}
 }
 
 @end