Some proj changes after switching to .NET 4.0