Some minor updates to various entities.