Fixing issues that came up when we merged the csproj