Adjustments to xmlpkgmker