DNS fixups, CLI dns cleanups