Added minor perfomance adjustments