More sample conversions to EF6/WebApi2