diff --git a/src/compiler/GF/Compile/ReadFiles.hs b/src/compiler/GF/Compile/ReadFiles.hs
index a64bb2a06..276aa2975 100644
--- a/src/compiler/GF/Compile/ReadFiles.hs
+++ b/src/compiler/GF/Compile/ReadFiles.hs
@@ -115,7 +115,7 @@ getAllFiles opts ps env file = do
                                      case mb_mo of
                                        Just mo -> return (st,importsOfModule mo)
                                        Nothing
-                                         | isGFO file -> ioeErr $ Bad (file ++ " is compiled with different GF version and I cannot find the source file")
+                                         | isGFO file -> ioeErr $ Bad (file ++ " is compiled with different GF version and I can't find the source file")
                                          | otherwise  -> do s <- ioeIO $ BS.readFile file
                                                             case runP pModHeader s of
                                                               Left (Pn l c,msg) -> ioeBad (file ++ ":" ++ show l ++ ":" ++ show c ++ ": " ++ msg)
diff --git a/src/compiler/GF/Grammar/Binary.hs b/src/compiler/GF/Grammar/Binary.hs
index 20adf3c48..c46f852a1 100644
--- a/src/compiler/GF/Grammar/Binary.hs
+++ b/src/compiler/GF/Grammar/Binary.hs
@@ -285,9 +285,8 @@ putGFOVersion = mapM_ (putWord8 . fromIntegral . ord) gfoVersion
 getGFOVersion = replicateM (length gfoVersion) (fmap (chr . fromIntegral) getWord8)
 
 decodeModule :: FilePath -> IO SourceModule
-decodeModule fpath = do
-  (m,mtype,mstatus,mflags,mextend,mwith,mopens,med,msrc) <- decodeFile_ fpath (getGFOVersion >> get)
-  return (m,ModInfo mtype mstatus mflags mextend mwith mopens med msrc Nothing Map.empty)
+decodeModule fpath =
+  decodeFile_ fpath (getGFOVersion >> get)
 
 decodeModuleHeader fpath = decodeFile_ fpath getVersionedMod
   where