All the fixes to my bad .csproj mess up