service: fixup