diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 18c88d94..9d6b49fb 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -263,7 +263,7 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
 - (void)_toggleEditors:(BOOL)editable {
   self.itemImageView.enabled = editable;
   self.itemNameTextField.enabled = editable;
-  self.itemImageView.enabled = editable;
+  self.itemImageView.editable = editable;
   self.notesTextView.editable = editable;
 }
 #pragma mark -
@@ -284,6 +284,7 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
   self.nodeController.content = node;
   self.entryViewController.representedObject = node.asEntry;
   self.groupViewController.representedObject = node.asGroup;
+  [self _toggleEditors:(nil != node.asGroup)];
 }
 
 - (IBAction)beginEditing:(id)sender {
diff --git a/MacPass/MPPlugin.h b/MacPass/MPPlugin.h
index fc4eddf8..8e4b85e8 100644
--- a/MacPass/MPPlugin.h
+++ b/MacPass/MPPlugin.h
@@ -37,14 +37,14 @@ FOUNDATION_EXPORT NSString *const kMPPluginFileExtension;
 
 @class KPKTree;
 
-@protocol MPTreeImporting <NSObject>
+@protocol MPPluginExporting <NSObject>
 
 @required
 - (KPKTree *)importTreeAtURL:(NSURL *)url error:(NSError **)error;
 
 @end
 
-@protocol MPTreeExporting <NSObject>
+@protocol MPPluginImporting <NSObject>
 
 @required
 - (NSData *)dataForTree:(KPKTree *)tree error:(NSError **)error;
diff --git a/MacPass/MPPluginHost.h b/MacPass/MPPluginHost.h
index 180cab5b..9101d2ab 100644
--- a/MacPass/MPPluginHost.h
+++ b/MacPass/MPPluginHost.h
@@ -7,6 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
 @class KPKNode;
 @class KPKEntry;
 @class KPKGroup;
@@ -22,4 +25,7 @@ typedef BOOL (^NodeMatchBlock)(KPKNode *aNode);
 - (NSArray<KPKEntry *> *)filteredEntriesUsingBlock:(NodeMatchBlock)matchBlock;
 - (NSArray<KPKGroup *> *)filteredGroupsUsingBlock:(NodeMatchBlock)matchBlock;
 
+- (void)presentError:(NSError *)error completionHandler:(void (^)(NSModalResponse response))completionHandler;
+
 @end
+NS_ASSUME_NONNULL_END
diff --git a/MacPass/MPPluginHost.m b/MacPass/MPPluginHost.m
index c3a7684a..36962761 100644
--- a/MacPass/MPPluginHost.m
+++ b/MacPass/MPPluginHost.m
@@ -33,7 +33,7 @@ static MPPluginHost *_instance;
 }
 
 - (NSArray<KPKEntry *> *)filteredEntriesUsingBlock:(NodeMatchBlock)matchBlock {
-  NSArray *currentDocuments = [[NSDocumentController sharedDocumentController] documents];
+  NSArray *currentDocuments = [NSDocumentController sharedDocumentController].documents;
   NSMutableArray *entries = [[NSMutableArray alloc] initWithCapacity:200];
   for(MPDocument *document in currentDocuments) {
     if(document.tree) {
@@ -49,4 +49,7 @@ static MPPluginHost *_instance;
   return nil;
 }
 
+- (void)presentError:(NSError *)error completionHandler:(void (^)(NSModalResponse))completionHandler {
+}
+
 @end
diff --git a/MacPass/MPPluginManager.h b/MacPass/MPPluginManager.h
index 389a8b3e..982e4d6c 100644
--- a/MacPass/MPPluginManager.h
+++ b/MacPass/MPPluginManager.h
@@ -15,7 +15,6 @@ FOUNDATION_EXPORT NSString *const MPPluginManagerDidUnloadPlugin;
 
 FOUNDATION_EXPORT NSString *const MPPluginManagerPluginBundleIdentifiyerKey;
 
-@class KPKNode;
 @class MPPlugin;
 
 @interface MPPluginManager : NSObject
diff --git a/MacPass/MPPluginManager.m b/MacPass/MPPluginManager.m
index d525790f..433b2343 100644
--- a/MacPass/MPPluginManager.m
+++ b/MacPass/MPPluginManager.m
@@ -142,7 +142,7 @@ NSString *const MPPluginManagerPluginBundleIdentifiyerKey = @"MPPluginManagerPlu
 }
 
 - (BOOL)_validateClass:(Class)class {
-  return ([class isSubclassOfClass:[MPPlugin class]]);
+  return [class isSubclassOfClass:[MPPlugin class]];
 }
 
 /* Code by Jedda Wignall<jedda@jedda.me> http://jedda.me/2012/03/verifying-plugin-bundles-using-code-signing/ */
diff --git a/MacPass/OutlineView.xib b/MacPass/OutlineView.xib
index effe6666..f1609117 100644
--- a/MacPass/OutlineView.xib
+++ b/MacPass/OutlineView.xib
@@ -92,7 +92,6 @@
                                                     <constraint firstItem="241" firstAttribute="centerY" secondItem="240" secondAttribute="centerY" id="349"/>
                                                     <constraint firstItem="243" firstAttribute="bottom" secondItem="241" secondAttribute="bottom" id="388"/>
                                                     <constraint firstAttribute="trailing" secondItem="243" secondAttribute="trailing" constant="3" id="389"/>
-                                                    <constraint firstAttribute="trailing" secondItem="243" secondAttribute="trailing" constant="3" id="4Vg-BQ-zVQ"/>
                                                 </constraints>
                                                 <connections>
                                                     <outlet property="imageView" destination="241" id="247"/>