Bucket ID generation fixup