relay fixes