More bucket fixes