Small changes to spawn node avoid