diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index f5cd3fb..30a5b6b 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -247,7 +247,7 @@ namespace Icarus.Controllers.Managers
 	    		}
 		}
 
-		public async Task SaveSong(SongData songData)
+		public void SaveSong(SongData songData)
 		{
 	    		try
 	    		{
@@ -413,7 +413,7 @@ namespace Icarus.Controllers.Managers
 
             		return _songs;
         	}
-		public async Task<Song> RetrieveSongDetails(int id)
+		public Song RetrieveSongDetails(int id)
 		{
 	    		DataTable results = new DataTable();
 
@@ -456,7 +456,7 @@ namespace Icarus.Controllers.Managers
 	    		SongData song = new SongData();
 	    		try
 	    		{
-	        		_song = await RetrieveSongDetails(id);
+	        		_song = RetrieveSongDetails(id);
 				song = await RetrieveSongFromFileSystem(_song);
 	    		}
 	    		catch (Exception ex)
diff --git a/Controllers/Utilities/SongCompression.cs b/Controllers/Utilities/SongCompression.cs
index 25f73e6..0c7eb24 100644
--- a/Controllers/Utilities/SongCompression.cs
+++ b/Controllers/Utilities/SongCompression.cs
@@ -13,7 +13,6 @@ namespace Icarus.Controllers.Utilities
     public class SongCompression
     {
         #region Fields
-	string _archiveDirectory;
 	string _compressedSongFilename;
 	string _tempDirectory;
         byte[] _uncompressedSong;
diff --git a/Database/Repositories/YearRepository.cs b/Database/Repositories/YearRepository.cs
index 08f7b60..2bf1c26 100644
--- a/Database/Repositories/YearRepository.cs
+++ b/Database/Repositories/YearRepository.cs
@@ -41,7 +41,7 @@ namespace Icarus.Database.Repositories
 
 					var query = "SELECT yr.*, COUNT(*) AS SongCount FROM Year " +
 						"yr LEFT JOIN Song sng ON yr.YearId=sng.YearId " +
-						"GROUP BY gnr.YearId";
+						"GROUP BY yr.YearId";
 
 					using (var cmd = new MySqlCommand(query, conn))
 					{