fixups for updated packages