Fixes compilation errors with remote call code