Various tweaks.
API change