Remote object CS/fixes

DON'T MERGE!