patches for cm's framework/av