More cleanup - fix issues with recursive resolution