fixes after api refactoring