Even more API fixes