Base: Minor performance optimizations