-fix a few entity annotations