Minor API improvements