fixups for squeeze