Bug fixes
Fix s3 issues and new url