Moar fixing of the service lifecycle