Minor changes to Entity module.