Some more optimizations