api and rsync fixes