Couple places need updating for new bucket impl