multishot abuse fixes