Fix server breakage