Trying to fix client calls to server