minor fixups
more small recursion fixes