Fixed up server teardown