Fixes in Entity and Manager classes.