More fixes on separator