Try forcing dependency resolution earlier