diff --git a/Plugin/CTFMenubarMenuController.m b/Plugin/CTFMenubarMenuController.m
index 619488f3..11dc6977 100644
--- a/Plugin/CTFMenubarMenuController.m
+++ b/Plugin/CTFMenubarMenuController.m
@@ -125,8 +125,6 @@ - (id) init
 	}
     
 	self = [ super init ];
-    
-	sSingleton = self;
 	
 	if( self ) {
 		if( ! [ NSBundle loadNibNamed: @"MenubarMenu" owner: self ] )
@@ -187,7 +185,7 @@ - (void) awakeFromNib
 + (CTFMenubarMenuController*) sharedController
 {
 	if( !sSingleton )
-		[ [ CTFMenubarMenuController alloc ] init ];
+		sSingleton = [ [ CTFMenubarMenuController alloc ] init ];
 	
 	return sSingleton;
 }
diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
index f4d4b0ba..a752fed5 100644
--- a/Plugin/Plugin.m
+++ b/Plugin/Plugin.m
@@ -86,9 +86,6 @@ - (id) initWithArguments:(NSDictionary *)arguments
 {
     self = [super init];
     if (self) {
-		// get defaults
-		NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-		
 		self.webView = [[[arguments objectForKey:WebPlugInContainerKey] webFrame] webView];
 		
         self.container = [arguments objectForKey:WebPlugInContainingElementKey];
@@ -133,7 +130,7 @@ - (id) initWithArguments:(NSDictionary *)arguments
 #endif
         
         _fromYouTube = [self.host isEqualToString:@"www.youtube.com"]
-                    || [flashvars rangeOfString: @"www.youtube.com"].location != NSNotFound;
+                    || ( flashvars != nil && [flashvars rangeOfString: @"www.youtube.com"].location != NSNotFound );
         
         // Handle if this is loading from whitelist
         
@@ -208,6 +205,7 @@ - (void) dealloc
     self.container = nil;
     self.host = nil;
 	self.webView = nil;
+	self.baseURL = nil;
     
     [_flashVars release];
     [_badgeText release];