Couple more API tweaks.