squashing push-overdub/cycle bugs