More fixes of curator