Some PKCS#11 fixes.