Additional minor optimizations