Improve server start stop