Fixes for optix search