fixes for multiple compute nodes