Fix various small items, including recursion test