relay: last fixes