Fixing S3 functionality.