Various minor fixes for Sayantan's OpenCL versus OS X.