Fixed a bunch of bucket bugs.