Small performance tuning