Various fixes and tweaks, post the change to API v2