Add hopefully magic things to make S3 work