More fixes to Dhiru's PBKDF2 OpenCL formats