Some performance tweaks.