fixup service more

Change-Id: Ibb7cbd2b4b54ee36c357ca82c137ffb1e9b7f20c