Some chipset fixes from CM