Fixing server remote calls