Encrypted Relay bug and leak fixes