Fixes for some of the domain classes and compute updates