Fix server errors

Follow