diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 0b7f67f94c..be1aae090c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -1021,6 +1021,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         private void GenerateLine(StringBuilder sb)
         {
             sb.Append("\n");
+            m_CSharpLine++;
+            m_CSharpCol = 1;
         }
 
         /// <summary>
@@ -1032,6 +1034,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         {
             sb.Append(s);
             sb.Append("\n");
+            m_CSharpLine++;
+            m_CSharpCol = 1;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 67762a3c9e..b51880d3b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             m_insertCoopTerminationCalls = m_scriptEngine.Config.GetString("ScriptStopStrategy", "abort") == "co-op";
 
             // Get file prefix from scriptengine name and make it file system safe:
-            FilePrefix = "CommonCompiler";
+            FilePrefix = "";
             foreach (char c in Path.GetInvalidFileNameChars())
             {
                 FilePrefix = FilePrefix.Replace(c, '_');
@@ -441,8 +441,8 @@ namespace SecondLife
 {{ 
     public class {0} : {1} 
     {{
-        public {0}({2}) : base({3}) {{}}
-",
+        public {0}({2}) : base({3}) {{}}"
+,
                 className,
                 baseClassName, 
                 constructorParameters != null