Domain name fixes