A few depend fixes, for easier recursion