Fix running without --server