More .NET fixes