fixes to main and node domain classes