A few performance adjustments.