Fixes for cluster run type