optics: Performance and responsiveness tweaks