More places where s/EntityManager/EntityManagerInterface is needed