some bucket fixes [ci skip]