minor API work