Fixed CPU bug(s)