Small performance changes