Sync and Bucket fixes