Tweaks to recursion to ensure deps fetched correctly