diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h
index 576fee2c..41ee5c05 100644
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -43,6 +43,14 @@ http://www.hardcoded.net/licenses/bsd_license
 - (HSRecentFiles *)recentResults;
 - (NSMenu *)columnsMenu;
 
+/* Delegate */
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
+- (void)applicationWillBecomeActive:(NSNotification *)aNotification;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)applicationWillTerminate:(NSNotification *)aNotification;
+- (void)recentFileClicked:(NSString *)path;
+- (void)showExtraFairwareReminder:(NSNotification *)aNotification;
+
 /* Actions */
 - (IBAction)loadResults:(id)sender;
 - (IBAction)openWebsite:(id)sender;
diff --git a/cocoa/base/DirectoryPanel.h b/cocoa/base/DirectoryPanel.h
index aae15e46..c67542f5 100644
--- a/cocoa/base/DirectoryPanel.h
+++ b/cocoa/base/DirectoryPanel.h
@@ -14,7 +14,7 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @class AppDelegateBase;
 
-@interface DirectoryPanel : NSWindowController
+@interface DirectoryPanel : NSWindowController <NSOpenSavePanelDelegate>
 {
     IBOutlet NSPopUpButton *addButtonPopUp;
     IBOutlet NSPopUpButton *loadRecentButtonPopUp;
diff --git a/cocoa/me/InfoTemplate.plist b/cocoa/me/InfoTemplate.plist
index d475507c..315cf3c1 100644
--- a/cocoa/me/InfoTemplate.plist
+++ b/cocoa/me/InfoTemplate.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>dupeguru</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded_software.dupeguru_me</string>
+	<string>com.hardcoded-software.dupeguru-me</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/cocoa/pe/InfoTemplate.plist b/cocoa/pe/InfoTemplate.plist
index 3c229b06..482455be 100644
--- a/cocoa/pe/InfoTemplate.plist
+++ b/cocoa/pe/InfoTemplate.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>dupeguru</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded_software.dupeguru_pe</string>
+	<string>com.hardcoded-software.dupeguru-pe</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/cocoa/se/InfoTemplate.plist b/cocoa/se/InfoTemplate.plist
index 153f4207..41c83b98 100644
--- a/cocoa/se/InfoTemplate.plist
+++ b/cocoa/se/InfoTemplate.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>dupeguru</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded_software.dupeguru</string>
+	<string>com.hardcoded-software.dupeguru</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>