Fix up concurrency issue in Marquise server