Updated for the latest saola changes.