Bucket index fixes