Recursion fixes

Signed-off-by: Robin Green <greenrd@greenrd.org>