- Small performance tweaks