Use CM repo to fix some bugs when building...