Small performance tweaks