Changes to ocl2 and ocl index