Fix server start/stop