[WIP] remote object CS/fixes

DON'T MERGE!