Fix ocl+rtt for latest v2.0.1 updates