Try harder to resolve dependencies