more fixes after dns module change