fixed EF issues