More fixes on generic domain objects...