more fixes
Merge pull request #164 from optopus/fix-oob-dns

more fixes