Fixed Terminate/Stop methods