remote mapping fixes