Updated to latest CM changes and new forks