#30 Fix server start/stop handlers