server start/stop fixes