Services fixes⎈

Change-Id: I1f5c1a07cc9617d63b5b53d01495accbd20c2ece
Signed-off-by: Evan Anderson <evan1124@gmail.com>