Improve S3 object coverage