Minor fixes after API changes.