diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 9b717c53..c8f08ce9 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -47,7 +47,7 @@ defaultMain :: (Show env, Read env)
 defaultMain load withSite = do
     config <- load
     logger <- makeLogger
-    withSite config logger $ runSettings
+    withSite config logger $ runSettings defaultSettings
         { settingsHost = "0.0.0.0"
         , settingsPort = appPort config
         }
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 09e37439..f88bcfbd 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -12,11 +12,11 @@ cabal-version:     >= 1.6
 build-type:        Simple
 homepage:          http://~project~.yesodweb.com/
 
-Flag production
-    Description:   Build the production executable.
+Flag dev
+    Description:   Turn on development settings, like auto-reload templates.
     Default:       False
 
-Flag devel
+Flag library-only
     Description:   Build for use with "yesod devel"
     Default:       False
 
diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 8ea71803..6f0f0932 100755
--- a/yesod/test/scaffold.sh
+++ b/yesod/test/scaffold.sh
@@ -7,9 +7,12 @@ runghc main.hs init
   cabal configure || cabal install
   cabal build
   cabal clean
-  cabal configure -fdevel
+  cabal configure -fdev
   cabal build
   cabal clean
-  cabal configure -fproduction
+  cabal configure -flibrary-only
+  cabal build
+  cabal clean
+  cabal configure
   cabal build
 )