Fix serve mode