fixed some compile errors. Need to change CPUTrace stuff