silly little changes to make buckets work with buckets... LOL no db problems