Fix client to work with new server