Fix Shell tear down not stopping server