Multi-DNS fixes