--- a/main.d	Sun Oct 17 07:42:00 2010 +0400
+++ b/main.d	Sun Oct 17 20:56:07 2010 +0400
@@ -337,6 +337,8 @@
 ///            else if (arg == "fPIC")
 ///                global.params.pic = 1;
 ///}
+			else if (arg == "map")
+				global.params.map = 1;
             else if (arg == "multiobj")
                 global.params.multiobj = 1;
             else if (arg == "g")
@@ -860,7 +862,13 @@
 			if (FileName.equals(ext, global.json_ext))
 			{
 				global.params.doXGeneration = 1;
-				global.params.xfilename = (cast(immutable(char)*)files.data[i])[0..0];
+				global.params.xfilename = (cast(String)files.data[i]).str;
+				continue;
+			}
+			
+		    if (FileName.equals(ext, global.map_ext))
+			{
+				global.params.mapfile = (cast(String)files.data[i]).str;
 				continue;
 			}
 
@@ -868,13 +876,13 @@
 {
             if (FileName.equals(ext, "res"))
             {
-                global.params.resfile = (cast(immutable(char)*)files.data[i])[0..0];		/// !!!
+                global.params.resfile = (cast(String)files.data[i]).str;
                 continue;
             }
 
             if (FileName.equals(ext, "def"))
             {
-                global.params.deffile = (cast(immutable(char)*)files.data[i])[0..0];
+                global.params.deffile = (cast(String)files.data[i]).str;
                 continue;
             }
 
@@ -1053,6 +1061,9 @@
     if (global.errors)
         fatal();
 	
+    global.dprogress = 1;
+    Module.runDeferredSemantic();
+	
     // Do pass 2 semantic analysis
     for (int i = 0; i < modules.dim; i++)
     {