Fix some bucket-related breakages.