Fixes for drumkit detection

These got broken on input/Controller rewrite.