Fixing a few things.

Will check for service id now.