Corrected some issues when working with child domains