Performance tweaks.