Switch to CM's frameworks/native

Errors, and errors with default sources