diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 3f9ad2645..83e18fac3 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -899,7 +899,6 @@ Global
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Builder|Mixed Platforms.Build.0 = Release|Any CPU
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Builder|x86.ActiveCfg = Release|Any CPU
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6882C74B-3ED2-4D76-9E7B-67B6A28808BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
diff --git a/source2/Compiler/Cosmos.XSharp/Parser.cs b/source2/Compiler/Cosmos.XSharp/Parser.cs
index 0ffe72334..1e4cf9bc9 100644
--- a/source2/Compiler/Cosmos.XSharp/Parser.cs
+++ b/source2/Compiler/Cosmos.XSharp/Parser.cs
@@ -115,7 +115,7 @@ namespace Cosmos.Compiler.XSharp {
         xLastCharType = xCharType;
       }
       // Last token
-      if (i - mStart > 0) {
+      if (mStart < mData.Length) {
         NewToken(ref i);
       }
     }
diff --git a/source2/Tests/XSharpCompilerTester/Cosmos.Compiler.XSharp.Test.csproj b/source2/Tests/XSharpCompilerTester/Cosmos.Compiler.XSharp.Test.csproj
index 22a698b0f..15b92f17d 100644
--- a/source2/Tests/XSharpCompilerTester/Cosmos.Compiler.XSharp.Test.csproj
+++ b/source2/Tests/XSharpCompilerTester/Cosmos.Compiler.XSharp.Test.csproj
@@ -19,7 +19,7 @@
     <SccProvider>SAK</SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -29,7 +29,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>