Minor performance optimizations