Update CM patches

closes #242