Updates, to get this CM10.1 work