Tweaks to support API v2