s3 and paperclip fixes