Another round of performance changes