stage: minor adjustments