minor api refactorings