Fix data access problems with EF7 - fixed by more recent builds