More API tweaks.