Fixes in remote services