Fixup for pull request #3 - DNS fixes