Updates for a successful CM10.1 build