Fixes for remote_url and sync