Lock down unpaid buckets

@tejohnso please review