Temporary fixes for ocl compiler