CM compatible patches