bucket fix and other