diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 99120138..9c69df1d 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1922,7 +1922,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "HicknHack Software GmbH";
 				TargetAttributes = {
 					4C77E36115B84A240093A587 = {
@@ -2973,6 +2973,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3028,6 +3029,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index 67042b7b..05f2fa75 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 4b27c35c..ccfd9708 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -717,14 +717,14 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   }
   KPKGroup *newGroup = [self.tree createGroup:parent];
   /* setting properties on entries is undoable, but we do not want to record this so disable on creation */
-  BOOL wasUndoEnabeld = self.undoManager.isUndoRegistrationEnabled;
+  KPK_SCOPED_DISABLE_UNDO_BEGIN(self.undoManager);
+  
   [self.undoManager disableUndoRegistration];
   newGroup.title = NSLocalizedString(@"DEFAULT_GROUP_NAME", @"Title for a newly created group");
   newGroup.iconId = MPIconFolder;
-  /* re-enable undo/redo if we did turn it off */
-  if(wasUndoEnabeld) {
-    [self.undoManager enableUndoRegistration];
-  }
+
+  KPK_SCOPED_DISABLE_UNDO_END;
+
   [newGroup addToGroup:parent];
   [newGroup.undoManager setActionName:NSLocalizedString(@"NEW_GROUP", "Action name for a newly created group")];
   [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentDidAddGroupNotification
diff --git a/MacPass/MPValueTransformerHelper.m b/MacPass/MPValueTransformerHelper.m
index 4d9774dd..ea90d7ee 100644
--- a/MacPass/MPValueTransformerHelper.m
+++ b/MacPass/MPValueTransformerHelper.m
@@ -49,7 +49,7 @@ NSString *const MPExpiryDateValueTransformerName = @"com.hicknhack.macpass.MPExp
                       static NSDateFormatter *formatter;
                       if(!formatter) {
                         formatter = [[NSDateFormatter alloc] init];
-                        formatter.dateStyle = kCFDateFormatterLongStyle;
+                        formatter.dateStyle = NSDateFormatterLongStyle;
                         formatter.timeStyle = NSDateFormatterNoStyle;
                       }
 
diff --git a/MacPassTests/MPDatabaseSearch.m b/MacPassTests/MPDatabaseSearch.m
index 10089123..f730609a 100644
--- a/MacPassTests/MPDatabaseSearch.m
+++ b/MacPassTests/MPDatabaseSearch.m
@@ -29,7 +29,7 @@
   self.tree = [[KPKTree alloc] init];
   self.tree.root = [[KPKGroup alloc] init];
   
-  /* FIXEM weak! */
+  /* FIXME: weak! */
   self.inheritingGroup = [self.tree createGroup:self.tree.root];
   self.includedGroup = [self.tree createGroup:self.tree.root];
   self.excludedGroup = [self.tree createGroup:self.tree.root];