Fix issues on the m8

Change-Id: Icd289e527172cb7a2b69e39833a5cdeba67a9438