More MIDI regression fixes (nw)