More rbd changes.