Add in some services used by XAPI

Also, a fix to service starting.