More fixes, including search service fix.