Fixed optimizations