Tweaks to API versions and package.xml