Index: Slim/Networking/Slimproto.pm
===================================================================
--- Slim/Networking/Slimproto.pm	(revision 2723)
+++ Slim/Networking/Slimproto.pm	(working copy)
@@ -333,8 +333,8 @@
 			);
 
 			$client->macaddress($mac);
+			$client->init();
 			$client->reconnect($paddr, $revision, $s, 0);  # don't "reconnect" if the player is new.
-			$client->init();
 		} else {
 			$::d_slimproto && msg("hello from existing client: $id on ipport: $ipport{$s}\n");
 			$client->reconnect($paddr, $revision, $s, $reconnect, $bytes_received);
Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 2722)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -246,7 +246,7 @@
 	my $playlistindex = shift;
 	
 	# get (and optionally set) the browseplaylistindex parameter that's kept in param stack
-	return $client->param( 'browseplaylistindex', $playlistindex);
+	return $client->param( 'browseplaylistindex', $playlistindex) || 0;
 }
 
 # DEPRECATED: for compatibility only, use $client->nowPlayingModeLines();