fix up linking issues
fix up linking issues - recursive