Improved hangup of PCs from plugins