Some additional performance tweaks.