tweaks to fix issues with slave nodes