Minor Perf optimizations