Fix bugs updating remote fields