Missed a few BiStim specific changes.