M/PItChip fixes