Intel compiler fixes following dispatch refactor