Tweaks to entities.rng schema