Aspnet 5.2 fixes