Minor adjustments (not done).