diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 76eafc9c..1d570d31 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -547,7 +547,7 @@ public class FullPlaybackActivity extends PlaybackActivity
 	/**
 	 * Decode the given mime type into a more human-friendly description.
 	 */
-	private String decodeMimeType(String mime)
+	private static String decodeMimeType(String mime)
 	{
 		if ("audio/mpeg".equals(mime)) {
 			return "MP3";
diff --git a/src/org/kreed/vanilla/LibraryPagerAdapter.java b/src/org/kreed/vanilla/LibraryPagerAdapter.java
index 83eb90b1..d749f3d3 100644
--- a/src/org/kreed/vanilla/LibraryPagerAdapter.java
+++ b/src/org/kreed/vanilla/LibraryPagerAdapter.java
@@ -793,7 +793,7 @@ public class LibraryPagerAdapter
 	/**
 	 * Creates the row data used by LibraryActivity.
 	 */
-	private Intent createHeaderIntent(View header)
+	private static Intent createHeaderIntent(View header)
 	{
 		int type = (Integer)header.getTag();
 		Intent intent = new Intent();
diff --git a/src/org/kreed/vanilla/MediaUtils.java b/src/org/kreed/vanilla/MediaUtils.java
index ae1d28b9..bc53dbf9 100644
--- a/src/org/kreed/vanilla/MediaUtils.java
+++ b/src/org/kreed/vanilla/MediaUtils.java
@@ -171,7 +171,6 @@ public class MediaUtils {
 		String sort = MediaStore.Audio.Playlists.Members.PLAY_ORDER;
 		QueryTask result = new QueryTask(uri, projection, selection, null, sort);
 		result.type = TYPE_PLAYLIST;
-		result.id = id;
 		return result;
 	}
 
diff --git a/src/org/kreed/vanilla/MusicAlphabetIndexer.java b/src/org/kreed/vanilla/MusicAlphabetIndexer.java
index 2eaec3e8..9a2a3fb7 100644
--- a/src/org/kreed/vanilla/MusicAlphabetIndexer.java
+++ b/src/org/kreed/vanilla/MusicAlphabetIndexer.java
@@ -72,7 +72,7 @@ public class MusicAlphabetIndexer {
 	/**
 	 * Returns the latin alphabet.
 	 */
-	public Object[] getSections()
+	public static Object[] getSections()
 	{
 		return ALPHABET;
 	}
diff --git a/src/org/kreed/vanilla/QueryTask.java b/src/org/kreed/vanilla/QueryTask.java
index e975bdd2..4aa18c5f 100644
--- a/src/org/kreed/vanilla/QueryTask.java
+++ b/src/org/kreed/vanilla/QueryTask.java
@@ -42,11 +42,6 @@ public class QueryTask {
 	 */
 	public int mode;
 
-	/**
-	 * Id of the group being queried.
-	 */
-	public long id;
-
 	/**
 	 * Type of the group being query. One of MediaUtils.TYPE_*.
 	 */
diff --git a/src/org/kreed/vanilla/Song.java b/src/org/kreed/vanilla/Song.java
index 632c2a48..5c8a6c04 100644
--- a/src/org/kreed/vanilla/Song.java
+++ b/src/org/kreed/vanilla/Song.java
@@ -120,7 +120,7 @@ public class Song implements Comparable<Song> {
 		{
 			return value.getRowBytes() * value.getHeight();
 		}
-	};
+	}
 
 	/**
 	 * The cache instance.