Some more work on getting the DNS client to work again