Couple of more API fixes.