diff --git a/MusicStore.sln b/MusicStore.sln
index eb6d28080e..34fdec5df6 100644
--- a/MusicStore.sln
+++ b/MusicStore.sln
@@ -10,9 +10,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicStore.net45", "src\MusicStore\MusicStore.net45.csproj", "{9C8A2D1F-D430-46DF-8F00-39E378EC8FB2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{44621553-AA7D-4893-8834-79582A7D8348}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/MvcMusicStore/App_Start/Startup.App.cs b/src/MvcMusicStore/App_Start/Startup.App.cs
index 873efdc8af..053b2a9a30 100644
--- a/src/MvcMusicStore/App_Start/Startup.App.cs
+++ b/src/MvcMusicStore/App_Start/Startup.App.cs
@@ -1,4 +1,5 @@
 using System.Configuration;
+using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using MvcMusicStore.Models;
@@ -20,10 +21,10 @@ namespace MvcMusicStore
                 new SampleData().Seed(context);
             }
 
-            CreateAdminUser();
+            CreateAdminUser().Wait();
         }
 
-        private async void CreateAdminUser()
+        private async Task CreateAdminUser()
         {
             var username = ConfigurationManager.AppSettings["DefaultAdminUsername"];
             var password = ConfigurationManager.AppSettings["DefaultAdminPassword"];
diff --git a/src/MvcMusicStore/Controllers/AccountController.cs b/src/MvcMusicStore/Controllers/AccountController.cs
index 4e11bdc6b3..9041287c9a 100644
--- a/src/MvcMusicStore/Controllers/AccountController.cs
+++ b/src/MvcMusicStore/Controllers/AccountController.cs
@@ -131,16 +131,24 @@ namespace MvcMusicStore.Controllers
         // GET: /Account/Manage
         public async Task<ActionResult> Manage(ManageMessageId? message)
         {
-            ViewBag.StatusMessage =
-                message == ManageMessageId.ChangePasswordSuccess
-                    ? "Your password has been changed."
-                    : message == ManageMessageId.SetPasswordSuccess
-                        ? "Your password has been set."
-                        : message == ManageMessageId.RemoveLoginSuccess
-                            ? "The external login was removed."
-                            : message == ManageMessageId.Error
-                                ? "An error has occurred."
-                                : "";
+            switch (message)
+            {
+                case ManageMessageId.ChangePasswordSuccess:
+                    ViewBag.StatusMessage = "Your password has been changed.";
+                    break;
+                case ManageMessageId.SetPasswordSuccess:
+                    ViewBag.StatusMessage = "Your password has been set.";
+                    break;
+                case ManageMessageId.RemoveLoginSuccess:
+                    ViewBag.StatusMessage = "The external login was removed.";
+                    break;
+                case ManageMessageId.Error:
+                    ViewBag.StatusMessage = "An error has occurred.";
+                    break;
+                default:
+                    ViewBag.StatusMessage = "";
+                    break;
+            }
 
             ViewBag.HasLocalPassword = await HasPasswordAsync();
             ViewBag.ReturnUrl = Url.Action("Manage");