diff --git a/MacPass/MPEntryViewController.h b/MacPass/MPEntryViewController.h
index 46e28157..d1731675 100644
--- a/MacPass/MPEntryViewController.h
+++ b/MacPass/MPEntryViewController.h
@@ -47,8 +47,5 @@ typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
 - (void)copyURL:(id)sender;
 - (void)openURL:(id)sender;
 
-/* Settings migration */
-+ (NSString *)timeInfoModificationTimeKeyPath;
-
 @end
 
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 09b38fc9..295ef47c 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -86,14 +86,6 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 
 @implementation MPEntryViewController
 
-+ (NSString *)timeInfoModificationTimeKeyPath {
-  static NSString *timeInfoModificationTimeKeyPath;
-  if(nil == timeInfoModificationTimeKeyPath) {
-    timeInfoModificationTimeKeyPath = [[NSString alloc] initWithFormat:@"%@.%@", NSStringFromSelector(@selector(timeInfo)), NSStringFromSelector(@selector(modificationDate))];
-  }
-  return timeInfoModificationTimeKeyPath;
-}
-
 - (NSString *)nibName {
   return @"EntryView";
 }
@@ -159,14 +151,14 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
   self.entryTable.autosaveName = @"EntryTable";
   self.entryTable.autosaveTableColumns = YES;
   
-  
   NSString *parentTitleKeyPath = [[NSString alloc] initWithFormat:@"%@.%@", NSStringFromSelector(@selector(parent)), NSStringFromSelector(@selector(title))];
+  NSString *timeInfoModificationTimeKeyPath = [[NSString alloc] initWithFormat:@"%@.%@", NSStringFromSelector(@selector(timeInfo)), NSStringFromSelector(@selector(modificationDate))];
   
   titleColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:NSStringFromSelector(@selector(title))ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)];
   userNameColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:NSStringFromSelector(@selector(username)) ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)];
   urlColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:NSStringFromSelector(@selector(url)) ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)];
   parentColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:parentTitleKeyPath ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)];
-  modifiedColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:[MPEntryViewController timeInfoModificationTimeKeyPath] ascending:YES selector:@selector(compare:)];
+  modifiedColumn.sortDescriptorPrototype = [NSSortDescriptor sortDescriptorWithKey:timeInfoModificationTimeKeyPath ascending:YES selector:@selector(compare:)];
   
   [parentColumn.headerCell setStringValue:NSLocalizedString(@"GROUP", "")];
   [titleColumn.headerCell setStringValue:NSLocalizedString(@"TITLE", "")];
diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m
index 002b5de9..e228cbbb 100644
--- a/MacPass/MPSettingsHelper.m
+++ b/MacPass/MPSettingsHelper.m
@@ -9,7 +9,7 @@
 #import "MPSettingsHelper.h"
 #import "NSString+MPPasswordCreation.h"
 #import "NSString+MPHash.h"
-#import "MPEntryViewController.h" // Sort descriptors
+#import "MPEntrySearchContext.h"
 #import "DDHotKey+MacPassAdditions.h" // Default hotkey;
 
 NSString *const kMPSettingsKeyPasteboardClearTimeout                  = @"ClipboardClearTimeout";
@@ -172,8 +172,9 @@ NSString *const kMPDeprecatedSettingsKeyShowMenuItem                      = @"Sh
   NSArray *sortDescriptors = [NSUnarchiver unarchiveObjectWithData:descriptorData];
   
   for(NSSortDescriptor *descriptor in sortDescriptors) {
+    /* Brute force, just kill the settings if they might cause trouble */
     if(descriptor.selector == @selector(compare:)
-       || [descriptor.key isEqualToString:[MPEntryViewController timeInfoModificationTimeKeyPath]]
+       || [descriptor.key isEqualToString:@"timeInfo.modificationDate"]
        || [descriptor.key isEqualToString:@"parent.name"] ) {
       [[NSUserDefaults standardUserDefaults] removeObjectForKey:kMPSettingsKeyEntryTableSortDescriptors];
       break;
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index fd93c718..0adba4f7 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -58,7 +58,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6</string>
+	<string>0.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>