more fixes after API changes