A couple more rsync-related patches