More performance tweaks.