Small optimizations