Minor API fixes