Some performance tunings