Fix issues with resolve_dns change