domain cleanups and fixes