Further relay fixes