Some improvements made during performance tuning.