Updated for API tweaks.