Changed all hardcoded S3 to use the global define of S3HOST