Fixing a few more comments in entity manager