Small API improvements