Fix up relay service