Some fixes

double check cpu mode we enter in.