More lighting optimizations