EF fixes again