Fix the requests to the server