Perf improvements

Second tranche of performance enhancements