fixes rest of domain objs