Fix up server