Fixing lifetimescope issues.