diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index b779419d6a..e7e077a549 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -110,7 +110,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Global.cs" />
-    <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="inputAdapters\BitwiseAdapters.cs" />
     <Compile Include="inputAdapters\InputAdapterExtensions.cs" />
     <Compile Include="inputAdapters\InputAdapters.cs" />
@@ -174,7 +173,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="RecentFiles.cs" />
-    <Compile Include="helpers\StringHelpers.cs" />
     <Compile Include="rewind\Rewinder.cs" />
     <Compile Include="rewind\RewindThreader.cs" />
     <Compile Include="rewind\StreamBlobDatabase.cs" />
@@ -217,7 +215,9 @@
       <Name>BizHawk.Bizware.BizwareGL</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="helpers\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
index 3688e8004a..c23a1a6464 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
@@ -273,6 +273,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				var domain = Global.Emulator.MemoryDomains[DomainDropDown.SelectedItem.ToString()];
 				var address = AddressBox.ToRawInt().Value;
+				//var address = AddressBox.ToRawInt() ?? 0;
 				if (address < domain.Size)
 				{
 					var watch = Watch.GenerateWatch(
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index 2c22064973..e7a63094d0 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -56,6 +56,7 @@
     <Compile Include="Extensions\Extensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="HawkFile.cs" />
+    <Compile Include="InputValidate.cs" />
     <Compile Include="IPC\IPCRingBuffer.cs" />
     <Compile Include="IPC\SharedMemoryBlock.cs" />
     <Compile Include="Log.cs" />
@@ -66,6 +67,7 @@
     <Compile Include="ReflectionUtil.cs" />
     <Compile Include="Serializer.cs" />
     <Compile Include="SettingsUtil.cs" />
+    <Compile Include="StringHelpers.cs" />
     <Compile Include="SwitcherStream.cs" />
     <Compile Include="UndoHistory.cs" />
     <Compile Include="Util.cs" />
diff --git a/BizHawk.Client.Common/helpers/InputValidate.cs b/BizHawk.Common/InputValidate.cs
similarity index 100%
rename from BizHawk.Client.Common/helpers/InputValidate.cs
rename to BizHawk.Common/InputValidate.cs
diff --git a/BizHawk.Client.Common/helpers/StringHelpers.cs b/BizHawk.Common/StringHelpers.cs
similarity index 100%
rename from BizHawk.Client.Common/helpers/StringHelpers.cs
rename to BizHawk.Common/StringHelpers.cs