s3backup fixes