A few more optimizations