Continuing to fix dependency management