Fix more cpuinit mismatches

Change-Id: I1d3d30af36ccb7085e7ccf21673f42085789f7c5