Fix server start/stop/update