minor changes to make it work again in 0.23.0