Fix remote object adapter dependence