Fix CMU rewrites