Fixes for cmpute supervisor