diff --git a/Make.hs b/Make.hs
index 1118fb397..bae1bade4 100644
--- a/Make.hs
+++ b/Make.hs
@@ -184,8 +184,12 @@ rglCommands =
     gfcp' :: Info -> Mode -> [String] -> [Mode -> [String] -> (LangInfo -> FilePath,[LangInfo] -> [LangInfo])] -> IO ()
     gfcp' bi mode args cs = do
       langsAll <- loadLangs
+      -- f :: LangInfo -> FilePath
+      -- as :: [LangInfo] -> [LangInfo]
+      -- ss :: [String]
+      -- fss :: [[FilePath]]
       let (ss,fss) = unzip [ (summary f langs,map f langs) | c<-cs, let (f,as) = c mode args, let langs = as langsAll]
-      gfcn bi mode (unwords ss) (concat fss)
+      gfcn bi mode (unwords (filter (not.null) ss)) (concat fss)
 
     summary :: (LangInfo -> FilePath) -> [LangInfo] -> String
     summary f langs = unwords (map (dropSourceDir . f) langs)
@@ -280,21 +284,24 @@ getOptMode args =
 
 -- | List of languages overriding the default definitions
 getOptLangs :: [LangInfo] -> [LangInfo] -> [String] -> [LangInfo]
-getOptLangs langs defaultLangs args =
-    case [ls | arg <- args,
-               let (f,ls) = splitAt (length lang_flag) arg,
-               f==lang_flag] of
-      ('+':ls):_ -> foldr addLang defaultLangs (seps ls)
-      ('-':ls):_ -> foldr removeLang defaultLangs (seps ls)
-      ls:_ -> findLangs langs (seps ls)
-      _    -> defaultLangs
+getOptLangs allLangs defaultLangs args =
+  let x = [ ls
+          | arg <- args
+          , let (f,ls) = splitAt (length lang_flag) arg
+          , f == lang_flag
+          ]
+  in case x of
+    -- ('+':ls):_ -> foldr addLang defaultLangs (seps ls)
+    ('-':ls):_ -> foldr removeLang defaultLangs (seps ls)
+    ls:_ -> findLangs defaultLangs (seps ls)
+    _    -> defaultLangs
   where
     seps = words . map (\c -> if c==',' then ' ' else c)
     findLangs langs ls = [lang | lang <- langs, langCode lang `elem` ls]
     removeLang l ls = [lang | lang <- ls, langCode lang /= l]
-    addLang l ls = if null (findLangs ls [l])
-                   then findLangs langs [l]++ls
-                   else ls
+    -- addLang l ls = if null (findLangs ls [l])
+    --                then findLangs allLangs [l]++ls
+    --                else ls
 
 -- | Get module names from arguments
 getOptModules :: [String] -> [FilePath]
@@ -378,26 +385,29 @@ separateBy chr = unfoldr sep where
 -------------------------------------------------------------------------------
 -- Executing GF
 
-gfc :: Info -> [Mode] -> String -> [String] -> IO ()
+gfc :: Info -> [Mode] -> String -> [FilePath] -> IO ()
 gfc bi modes summary files =
   parallel_ [gfcn bi mode summary files | mode<-modes]
 
-gfcn :: Info -> Mode -> String -> [String] -> IO ()
-gfcn _ _ _ [] = die $ "No files specified.\nMake sure the language is in " ++ configFile ++ " and that it supports the modes/modules specified."
+gfcn :: Info -> Mode -> String -> [FilePath] -> IO ()
 gfcn bi mode summary files = do
   let dir = getRGLBuildDir bi mode
       preproc = case mode of
                   AllTenses -> ""
                   Present   -> "--preproc=mkPresent"
   createDirectoryIfMissing True dir
-  putStrLn $ "Building [" ++ show mode ++ "] " ++ summary
-  run_gfc bi ([if infoVerbose bi then "--verbose" else "--quiet", "--no-pmcfg", preproc, "--gfo-dir="++dir] ++ files)
+  if length files > 0
+  then do
+    putStrLn $ "Building [" ++ show mode ++ "] " ++ summary
+    run_gfc bi ([if infoVerbose bi then "--verbose" else "--quiet", "--no-pmcfg", preproc, "--gfo-dir="++dir] ++ files)
+  else
+    putStrLn $ "Skipping [" ++ show mode ++ "] (nothing to build)"
 
 -- | Runs the gf executable in compile mode with the given arguments
 run_gfc :: Info -> [String] -> IO ()
 run_gfc bi args = do
   let
-    args' = ["--batch","--gf-lib-path="] ++ filter (not . null) args
+    args' = ["--batch"] ++ filter (not . null) args
     gf = infoGFPath bi
   execute gf args'
 
diff --git a/README.md b/README.md
index 960a08471..3c6f862fe 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ or an explicit module name (e.g. `ExtraEng.gf`. You don't need to specify to lan
 (default is both).
 - `LANG` is a 3-letter language code, e.g. `Eng`, `Swe` etc.
 - You can _override_ the default language list with `--langs=...`
-- You can _add_ languages to the default list with `--langs=+...`
+- ~~You can _add_ languages to the default list with `--langs=+...`~~
 - You can _remove_ languages from the default list with `langs=-...`
 - The path to GF installed on your system can be specified via the `--gf` flag (default is that the `gf` executable is in the global system path).
 - The `--dest` flag can be used to manually specify where the compiled RGL modules should be copied/installed. This is the same place as `GF_LIB_PATH`.