Small performance modifications