Fixes to make paperclip work with aws