Fix entity annotations