Encryption error fix plus session replay fix