Tweaks to location syncing