Tweaks to fix dependency management