Fixes for tools rsync