Drum entry bugs

These three bugs are mostly independent, but I suspect the second commit probably depends on the fix in the first in order to work correctly.