More API tweaks