Add small optimizations