diff --git a/NSString_RegEx.m b/NSString_RegEx.m
index 38d3848..0b593a6 100644
--- a/NSString_RegEx.m
+++ b/NSString_RegEx.m
@@ -85,6 +85,7 @@ catch_exit:
 	if (pmatch)
 		free(pmatch);
 	regfree(&preg);
+    [[NSGarbageCollector defaultCollector] collectIfNeeded];
 	return outMatches;
 }
 
diff --git a/PBCLIProxy.m b/PBCLIProxy.m
index 83507d2..5aabd53 100644
--- a/PBCLIProxy.m
+++ b/PBCLIProxy.m
@@ -20,12 +20,11 @@
 - (id)init
 {
 	if (self = [super init]) {
-		self.connection = [NSConnection new];
-		[self.connection setRootObject:self];
+		connection = [NSConnection new];
+		[connection setRootObject:self];
 
-		if ([self.connection registerName:ConnectionName] == NO)
+		if ([connection registerName:ConnectionName] == NO)
 			NSBeep();
-
 	}
 	return self;
 }
diff --git a/PBGitWindowController.h b/PBGitWindowController.h
index ae2298b..d859c04 100644
--- a/PBGitWindowController.h
+++ b/PBGitWindowController.h
@@ -10,7 +10,7 @@
 #import "PBGitRepository.h"
 
 @class PBViewController;
-@interface PBGitWindowController : NSWindowController {
+@interface PBGitWindowController : NSWindowController <NSWindowDelegate> {
 	__weak PBGitRepository* repository;
 	int selectedViewIndex;
 	IBOutlet NSView* contentView;
diff --git a/PBGitWindowController.m b/PBGitWindowController.m
index 359e7f5..232b76c 100644
--- a/PBGitWindowController.m
+++ b/PBGitWindowController.m
@@ -153,7 +153,7 @@
 	[item bind:@"selectedIndex" toObject:self withKeyPath:@"selectedViewIndex" options:0];
 	[item setEnabled: ![repository isBareRepository]];
 
-	[self.window setToolbar:toolbar];
+	[[self window] setToolbar:toolbar];
 }
 
 @end
diff --git a/PBQLOutlineView.m b/PBQLOutlineView.m
index d4f6bd7..52f2718 100644
--- a/PBQLOutlineView.m
+++ b/PBQLOutlineView.m
@@ -71,24 +71,26 @@
 
 		// figure out if the row that was just clicked on is currently selected
 		if ([selectedRowIndexes containsIndex:row] == NO)
-			[self selectRow:row byExtendingSelection:NO];
+			[self selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
 	}
 
 	return [controller contextMenuForTreeView];
 }
 
 /* Implemented to satisfy datasourcee protocol */
-- (BOOL) outlineView: (NSOutlineView *)ov
-         isItemExpandable: (id)item { return YES; }
+- (BOOL) outlineView:(NSOutlineView *)ov isItemExpandable:(id)item {
+    return YES;
+}
 
-- (NSInteger)  outlineView: (NSOutlineView *)ov
-         numberOfChildrenOfItem:(id)item { return 0; }
+- (NSInteger) outlineView:(NSOutlineView *)ov numberOfChildrenOfItem:(id)item {
+    return 0;
+}
 
-- (id)   outlineView: (NSOutlineView *)ov
-         child:(NSInteger)index
-         ofItem:(id)item { return nil; }
+- (id) outlineView:(NSOutlineView *)ov child:(NSInteger)index ofItem:(id)item {
+    return nil;
+}
 
-- (id)   outlineView: (NSOutlineView *)ov
-         objectValueForTableColumn:(NSTableColumn*)col
-         byItem:(id)item { return nil; }
+- (id) outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn *)col byItem:(id)item {
+    return nil;
+}
 @end
diff --git a/PBUnsortableTableHeader.h b/PBUnsortableTableHeader.h
index 2881e93..a8b9127 100644
--- a/PBUnsortableTableHeader.h
+++ b/PBUnsortableTableHeader.h
@@ -8,7 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-
 @interface PBUnsortableTableHeader : NSTableHeaderView {
 	IBOutlet NSArrayController *controller;
 	int clickCount;
diff --git a/PBUnsortableTableHeader.m b/PBUnsortableTableHeader.m
index 9afb8eb..acff658 100644
--- a/PBUnsortableTableHeader.m
+++ b/PBUnsortableTableHeader.m
@@ -8,7 +8,6 @@
 
 #import "PBUnsortableTableHeader.h"
 
-
 @implementation PBUnsortableTableHeader
 
 - (void)mouseDown:(NSEvent *)theEvent
@@ -30,7 +29,7 @@
 	if (++clickCount == 3)
 	{
 		clickCount = 0;
-		controller.sortDescriptors = [NSArray array];
+		[controller setSortDescriptors:[NSArray array]];
 		[controller rearrangeObjects];
 		return;
 	}