Update EF for remaining projects.

Also perform some tweaks to Import, check it still works.