Fix server clients