diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index c31f6c689..e28adaf8b 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -9,7 +9,7 @@
 
 @implementation PlaybackController
 
-#define DEFAULT_SEEK 10
+#define DEFAULT_SEEK 5
 
 @synthesize playbackStatus;
 
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
index 95eb07eba..86d46820f 100644
--- a/Playlist/PlaylistView.m
+++ b/Playlist/PlaylistView.m
@@ -198,7 +198,7 @@
             addedItems++;
         }
 
-
+		int remQ = 0;
 		if (song.queuePosition > 0)
 		{
 			NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
@@ -210,8 +210,13 @@
 			queueRemoveMenuItem.target = playlistController;
 			[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
 			[queueRemoveMenuItem release];
+			remQ = 1;
 		}
-		
+		if (remQ == 1)
+            [tableViewMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
+		else
+            [tableViewMenu insertItem:[NSMenuItem separatorItem] atIndex:1];
+			
         if(addedItems)
         {
             // add a separator in the right place - turned into a hack now
diff --git a/Plugins/WMA/WMADecoder.m b/Plugins/WMA/WMADecoder.m
index fa0244061..dcaf295ea 100644
--- a/Plugins/WMA/WMADecoder.m
+++ b/Plugins/WMA/WMADecoder.m
@@ -18,10 +18,12 @@
 
 - (BOOL)open:(id<CogSource>)s
 {
+	source = [s retain];
+
+	
 	int err, i;
 	const char *filename = [[[source url] path] UTF8String];
 	
-	source = [s retain];
 	ic = NULL;
 	
 	// register all available codecs