diff --git a/samples/MvcSample/Program.cs b/samples/MvcSample/Program.cs
index 25cb146332..e15a02fdeb 100644
--- a/samples/MvcSample/Program.cs
+++ b/samples/MvcSample/Program.cs
@@ -1,5 +1,6 @@
 using System;
 #if NET45
+using System.Diagnostics;
 using Microsoft.Owin.Hosting;
 #endif
 
@@ -15,6 +16,7 @@ namespace MvcSample
             using (WebApp.Start<Startup>(new StartOptions(baseUrl)))
             {
                 Console.WriteLine("Listening at {0}", baseUrl);
+                Process.Start(baseUrl);
                 Console.WriteLine("Press any key to exit");
                 Console.ReadKey();
             }
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
index 7e6f0fabbf..539c5311ad 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             string outFile = Path.Combine(_tempDir, Path.GetRandomFileName() + ".dll");
             StringBuilder args = new StringBuilder("/target:library ");
             args.AppendFormat("/out:\"{0}\" ", outFile);
-            foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "*.dll"))
+            foreach (var file in Directory.EnumerateFiles(Directory.GetCurrentDirectory(), "*.dll"))
             {
                 args.AppendFormat("/R:\"{0}\" ", file);
             }