More fixes towards review process