relay: fix some minor issues