More dns-regen fixes