Fix how stop resets things to prevent issues