Some small changes to stopping and sending