Improve server stop events