A few minor fixes following testing with S3