Improvements for manual testing
Shut down the server more reliably