Minor API additions/improvements