More keyring-opencl fixes.