First round of performance improvements.