Minor API extensions