Partial fix for server start/stop actions.