Further improvements to voice stealing