Dependency Resolver & Bootstrapper fix.