Some more optimizations,