Domain name grabber fixes