diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m
index 4b45f069..8989d537 100644
--- a/Source/AppDelegate.m
+++ b/Source/AppDelegate.m
@@ -62,11 +62,6 @@ static const NSTimeInterval kTimeoutInterval = 60.0;
     LTLoadLanguageModel();
 
     [self checkForUpdate];
-
-    if (0) {
-        PreferencesWindowController *controller = [[PreferencesWindowController alloc] initWithWindowNibName:@"preferences"];
-        [[controller window] orderFront:nil];
-    }
 }
 
 - (void)checkForUpdate
diff --git a/Source/CandidateUI/VTCandidateController.h b/Source/CandidateUI/VTCandidateController.h
index 39ff3270..264207e7 100644
--- a/Source/CandidateUI/VTCandidateController.h
+++ b/Source/CandidateUI/VTCandidateController.h
@@ -38,7 +38,7 @@
 @interface VTCandidateController : NSWindowController
 {
 @protected
-    __weak id<VTCandidateControllerDelegate> _delegate;
+    id<VTCandidateControllerDelegate> _delegate;
     NSArray *_keyLabels;
     NSFont *_keyLabelFont;
     NSFont *_candidateFont;
diff --git a/Source/CandidateUI/VTHorizontalCandidateView.h b/Source/CandidateUI/VTHorizontalCandidateView.h
index c5295503..d71d3128 100644
--- a/Source/CandidateUI/VTHorizontalCandidateView.h
+++ b/Source/CandidateUI/VTHorizontalCandidateView.h
@@ -41,7 +41,7 @@
     NSUInteger _highlightedIndex;
     NSUInteger _trackingHighlightedIndex;
     SEL _action;
-    __weak id _target;
+    id _target;
 }
 
 - (void)setKeyLabels:(NSArray *)labels displayedCandidates:(NSArray *)candidates;
diff --git a/Source/Installer/Installer-Info.plist b/Source/Installer/Installer-Info.plist
index 2154542d..247ff9c7 100644
--- a/Source/Installer/Installer-Info.plist
+++ b/Source/Installer/Installer-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>McBopomofo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.openvanilla.McBopomofo.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Source/McBopomofo-Info.plist b/Source/McBopomofo-Info.plist
index cdb5b1fa..b552cbfb 100644
--- a/Source/McBopomofo-Info.plist
+++ b/Source/McBopomofo-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>McBopomofo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.openvanilla.inputmethod.McBopomofo</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Source/main.m b/Source/main.m
index 029d0393..ec3677e8 100644
--- a/Source/main.m
+++ b/Source/main.m
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
             NSLog(@"Enabling input source %@ at %@.", bundleID, [bundleURL absoluteString]);
             BOOL status = [OVInputSourceHelper enableInputSource:inputSource];
 
-            if (!status != noErr) {
+            if (!status) {
                 NSLog(@"Fatal error: Cannot enable input source %@.", bundleID);
                 [pool drain];
                 return -1;