Fix to Pufferfish to call raw kdf