Some minor tuning.