Modified S3 bucket refs again