Updates for O-pal/clarinet API changes