small performance adjustments