garbd fixes