Fixes in Prekey pipeline