Fixes for node groups