Fixes for node hierarchy expansions.