minor tweaks to entity registry