diff --git a/.gitignore b/.gitignore
index 6267aed7..eb8aa458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,5 @@ $RECYCLE.BIN/
 
 # Do not pull in UniversalEditor WinForms until we're ready
 CSharp/Applications/UniversalEditor.DesktopApplication.WindowsForms
+# Do not pull in output files (if you're gonna get the source, build it yourself)
+CSharp/Output
diff --git a/CSharp/Applications/UniversalEditor.ConsoleApplication/UniversalEditor.ConsoleApplication.csproj b/CSharp/Applications/UniversalEditor.ConsoleApplication/UniversalEditor.ConsoleApplication.csproj
index 027750f7..32ae31a3 100644
--- a/CSharp/Applications/UniversalEditor.ConsoleApplication/UniversalEditor.ConsoleApplication.csproj
+++ b/CSharp/Applications/UniversalEditor.ConsoleApplication/UniversalEditor.ConsoleApplication.csproj
@@ -22,7 +22,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>MichaelBecker-20120317.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -55,7 +56,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="MichaelBecker-20120317.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.Core\UniversalEditor.Core.csproj">
diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs
index b7148252..5f79e71e 100644
--- a/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/StringAccessor.cs
@@ -7,7 +7,7 @@ namespace UniversalEditor.Accessors
 {
 	public class StringAccessor : Accessor
 	{
-		private char[] _data = new byte[0];
+		private char[] _data = new char[0];
 
 		private long ptr = 0;
 		public override long Length
diff --git a/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs b/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
index 54c52315..f87d7a6e 100644
--- a/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
@@ -137,11 +137,11 @@ namespace UniversalEditor
 		private System.Collections.Specialized.StringCollection mvarSources = new System.Collections.Specialized.StringCollection();
 		public System.Collections.Specialized.StringCollection Sources { get { return mvarSources; } }
 
-		private CustomOption.ExportOptionCollection mvarImportOptions = new CustomOption.ExportOptionCollection();
-		public CustomOption.ExportOptionCollection ImportOptions { get { return mvarImportOptions; } }
+		private CustomOption.CustomOptionCollection mvarImportOptions = new CustomOption.CustomOptionCollection();
+		public CustomOption.CustomOptionCollection ImportOptions { get { return mvarImportOptions; } }
 
-		private CustomOption.ExportOptionCollection mvarExportOptions = new CustomOption.ExportOptionCollection();
-		public CustomOption.ExportOptionCollection ExportOptions { get { return mvarExportOptions; } }
+		private CustomOption.CustomOptionCollection mvarExportOptions = new CustomOption.CustomOptionCollection();
+		public CustomOption.CustomOptionCollection ExportOptions { get { return mvarExportOptions; } }
 
 		public virtual DataFormat Create()
 		{
diff --git a/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj b/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
index 7cfdf02d..6c9cfd67 100644
--- a/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
+++ b/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
@@ -35,7 +35,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>MichaelBecker-20120317.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -63,9 +64,6 @@
     <Compile Include="ObjectModelNotSupportedException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="MichaelBecker-20120317.pfx" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.