Fixes when loading buckets