Update to match changes in Nuthatch