Patches + fixes for cm11 source