Fixed lifecycle stuff for services.