Fixing things that got broken like the entity manager,
Other things that should have been implemented.