minor api improvements