Better alignment of bucket headers