Fix up for new server