diff --git a/NETGenerator/NETGenerator.csproj b/NETGenerator/NETGenerator.csproj
index 2a9f6282e..3fdab4696 100644
--- a/NETGenerator/NETGenerator.csproj
+++ b/NETGenerator/NETGenerator.csproj
@@ -130,8 +130,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\configuration\globalassemblyinfo.cs">
-      <Link>Config\globalassemblyinfo.cs</Link>
+    <Compile Include="..\Configuration\GlobalAssemblyInfo.cs">
+      <Link>Config\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Config\AssemblyInfo.cs" />
     <Compile Include="NETGenegratorTools.cs" />
@@ -169,4 +169,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ParserTools/ParserTools.csproj b/ParserTools/ParserTools.csproj
index 63b9a9425..451eaf45c 100644
--- a/ParserTools/ParserTools.csproj
+++ b/ParserTools/ParserTools.csproj
@@ -71,7 +71,7 @@
     <Compile Include="ParserTools\DefaultLanguageInformation.cs" />
     <Compile Include="ParserTools\Errors.cs" />
     <Compile Include="ParserTools\IPreprocessor.cs" />
-    <Compile Include="ParserTools\Keyword.cs" />
+    <Compile Include="ParserTools\KeyWord.cs" />
     <Compile Include="ParserTools\LanguageInformation.cs" />
     <Compile Include="ParserTools\ParserTools.cs" />
     <Compile Include="ParserTools\SourceContextMap.cs" />
@@ -115,11 +115,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/_RebuildReleaseAndRunTests.sh b/_RebuildReleaseAndRunTests.sh
index 106790ecb..9095e86a4 100644
--- a/_RebuildReleaseAndRunTests.sh
+++ b/_RebuildReleaseAndRunTests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-MONO_IOMAP=case xbuild /p:Configuration=release pabcnetc.sln
-MONO_IOMAP=case xbuild /p:Configuration=release CodeCompletion/CodeCompletion.csproj
+MONO_IOMAP=case msbuild /p:Configuration=release pabcnetc.sln
+MONO_IOMAP=case msbuild /p:Configuration=release CodeCompletion/CodeCompletion.csproj
 mono --aot bin/pabcnetc.exe
 mono --aot bin/NETGenerator.dll
 mono --aot bin/TreeConverter.dll
diff --git a/bin/pabcnetc b/bin/pabcnetc
old mode 100644
new mode 100755
diff --git a/pabcnetc/ConsoleCompiler.cs b/pabcnetc/ConsoleCompiler.cs
index ea8145b60..8c3e6cdd0 100644
--- a/pabcnetc/ConsoleCompiler.cs
+++ b/pabcnetc/ConsoleCompiler.cs
@@ -47,7 +47,7 @@ namespace PascalABCCompiler
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
             Console.ForegroundColor = ConsoleColor.Gray;
-            if (command == "") return false;
+            if (command == "" || command == null) return false;
             if (command.ToLower().IndexOf("cd ") == 0)
             {
                 try