Domain debugging and fixes