Port garbd fixes from 3.x