dependency resolver fixes