Fix some CPU issues.