PRs ready for review _

Would be really great if my two PRs could get some love!

Thank you in advance! One’s a bugfix, one’s a significant perf improvement on the AWS S3 codepath!