Make final changes to enable Entity Framework to work.