CPU fixes