Bucket tweaks and Sync Tweak