Fix minor issues in building packages.