Several fixes on the relay operations