fixed some issues with service manager + related.