More dns-regen work