Fix server API