Fix corrupted .csproj and some oversights