diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index 1fabcfcd..58fbe75e 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -108,7 +108,7 @@
 
 - (void)createGroup:(id)sender {
   KdbGroup *group = [self _clickedOrSelectedGroup];
-  MPDocument *document = [[NSDocumentController sharedDocumentController] currentDocument];
+  MPDocument *document = [[self windowController] document];
   if(!group) {
     group = document.root;
   }
@@ -130,7 +130,7 @@
     return; // Entries are not allowed in root group
   }
   if(group) {
-    MPDocument *document = [[NSDocumentController sharedDocumentController] currentDocument];
+    MPDocument *document = [[self windowController] document];
     [document createEntry:group];
     // Notify the the entry view about changes
   }
@@ -139,8 +139,8 @@
 - (void)deleteEntry:(id)sender {
   KdbGroup *group = [self _clickedOrSelectedGroup];
   if(group) {
-    [group.parent removeGroup:group];
-    [self.outlineView reloadData];
+    MPDocument *document = [[self windowController] document];
+    [document deleteGroup:group];
   }
 }
 
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 44b04585..03086f32 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>AB9</string>
+	<string>ABD</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>