Improvements related to the document.domain part