Some quick fixes for the new DNS configuration