fix code first issues with 7.1