diff -urN slimserver.old/Plugins/iTunes.pm slimserver/Plugins/iTunes.pm
--- slimserver.old/Plugins/iTunes.pm	2006-04-25 19:22:40.000000000 -0400
+++ slimserver/Plugins/iTunes.pm	2006-05-21 03:25:39.000000000 -0400
@@ -1145,10 +1145,7 @@
 		'Groups' => {
 
 			'Default' => {
-				'PrefOrder' => ['itunesscaninterval',
-								'ignoredisableditunestracks',
-								'itunes_library_xml_path',
-								'itunes_library_music_path']
+				'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks']
 			},
 
 			'iTunesPlaylistFormat' => {
diff -urN slimserver.old/Slim/Player/Source.pm slimserver/Slim/Player/Source.pm
--- slimserver.old/Slim/Player/Source.pm	2006-04-25 19:23:15.000000000 -0400
+++ slimserver/Slim/Player/Source.pm	2006-05-21 03:27:28.000000000 -0400
@@ -1532,7 +1532,9 @@
 				return undef;
 			}
 
-			if (!$size && !$duration) {
+			# This is an upstream problem with how they implemented the logic:
+			# if (!$size || !$duration) {
+			if (((defined($size)) && (!$size)) || ((defined($duration)) && (!$duration))) {
 
 				$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");
 				errorOpening($client);
diff -urN slimserver.old/Slim/Web/Setup.pm slimserver/Slim/Web/Setup.pm
--- slimserver.old/Slim/Web/Setup.pm	2006-04-25 19:23:15.000000000 -0400
+++ slimserver/Slim/Web/Setup.pm	2006-05-21 03:28:47.000000000 -0400
@@ -1248,7 +1248,7 @@
 			},
 
 			'Default' => {
-				'PrefOrder' => ['audiodir', 'playlistdir', undef],
+				'PrefOrder' => [undef],
 			},
 
 			'Rescan' => {
@@ -1440,7 +1440,7 @@
 		,'Groups' => {
 			'Default' => {
 					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
-					'artfolder','thumbSize','includeNoArt']
+					'thumbSize','includeNoArt']
 				}
 			}
 		,'Prefs' => {