service: small fixes