Fix server-start errors