Fix build errors for CM10.1