More recursion fixes