Fixed EF problems.