Fix bucket manager