Working towards successful CM10 build