Migrated Tim's fixes for dots in bucket names