Fix package.xmls for buildfirm